Initial commit
This commit is contained in:
Your Name
+41
@@ -0,0 +1,41 @@
|
||||
From e76a062338063615c069fedc5a143cc38c34d9b2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Tue, 28 Feb 2017 01:00:21 +0100
|
||||
Subject: [PATCH] Fl_Preferences.cxx: do not use dlopen in case glibc's headers
|
||||
are missing
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
| /home/work/x86_64-linux/fltk-native/1.3.4-1-r0/fltk-1.3.4-1/src/Fl_Preferences.cxx: In static member function ‘static int Fl_Plugin_Manager::load(const char*)’:
|
||||
| /home/work/x86_64-linux/fltk-native/1.3.4-1-r0/fltk-1.3.4-1/src/Fl_Preferences.cxx:1741:27: error: ‘RTLD_LAZY’ was not declared in this scope
|
||||
| dl = dlopen(filename, RTLD_LAZY);
|
||||
| ^~~~~~~~~
|
||||
| /home/work/x86_64-linux/fltk-native/1.3.4-1-r0/fltk-1.3.4-1/src/Fl_Preferences.cxx:1741:36: error: ‘dlopen’ was not declared in this scope
|
||||
| dl = dlopen(filename, RTLD_LAZY);
|
||||
| ^
|
||||
| src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
---
|
||||
Upstream-Status: Pending
|
||||
|
||||
src/Fl_Preferences.cxx | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx
|
||||
index 1233bb1..7857b9b 100644
|
||||
--- a/src/Fl_Preferences.cxx
|
||||
+++ b/src/Fl_Preferences.cxx
|
||||
@@ -1737,7 +1737,7 @@ int Fl_Plugin_Manager::load(const char *filename) {
|
||||
HMODULE dl = LoadLibrary(filename);
|
||||
#else
|
||||
void * dl = NULL;
|
||||
-# if HAVE_DLSYM
|
||||
+# if HAVE_DLSYM && HAVE_DLFCN_H
|
||||
dl = dlopen(filename, RTLD_LAZY);
|
||||
# endif
|
||||
#endif
|
||||
--
|
||||
2.9.3
|
||||
|
||||
+31
@@ -0,0 +1,31 @@
|
||||
From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Sat, 22 May 2021 12:33:15 +0200
|
||||
Subject: [PATCH] always build fluid and export pointers
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
CMake/export.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMake/export.cmake b/CMake/export.cmake
|
||||
index 6e8bc5d..71b6f6c 100644
|
||||
--- a/CMake/export.cmake
|
||||
+++ b/CMake/export.cmake
|
||||
@@ -20,7 +20,7 @@
|
||||
#######################################################################
|
||||
|
||||
# Set the fluid executable path
|
||||
-if (CMAKE_CROSSCOMPILING)
|
||||
+if (FALSE)
|
||||
find_file(FLUID_PATH
|
||||
NAMES fluid fluid.exe
|
||||
PATHS ENV PATH
|
||||
--
|
||||
2.31.1
|
||||
|
||||
+42
@@ -0,0 +1,42 @@
|
||||
From b6985abcb03fb09685da4044963e8f085035b208 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
||||
Date: Thu, 19 Aug 2021 08:06:45 +0200
|
||||
Subject: [PATCH] fluid/CMakeLists.txt: Do not export fluid target
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It does not work for us: The executable 'fluid' is not installed in
|
||||
receipe-sysroot. So fltk cmake config contains an invalid reference.
|
||||
Consumers of fltk using cmake will fail during configure for this invalid
|
||||
reference with something like:
|
||||
|
||||
| CMake Error at <...>/recipe-sysroot/usr/share/fltk/FLTK-Targets.cmake:129 (message):
|
||||
| The imported target "fluid" references the file
|
||||
|
|
||||
| "<...>/recipe-sysroot/usr/bin/fluid"
|
||||
|
|
||||
| but this file does not exist.
|
||||
|
||||
Upstream-Status: Inappropriate [OE specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
||||
---
|
||||
fluid/CMakeLists.txt | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
|
||||
index 472c84c..f971121 100644
|
||||
--- a/fluid/CMakeLists.txt
|
||||
+++ b/fluid/CMakeLists.txt
|
||||
@@ -86,7 +86,6 @@ if (APPLE AND (NOT OPTION_APPLE_X11))
|
||||
install (TARGETS fluid DESTINATION ${FLTK_BINDIR})
|
||||
else()
|
||||
install (TARGETS fluid
|
||||
- EXPORT FLTK-Targets
|
||||
RUNTIME DESTINATION ${FLTK_BINDIR}
|
||||
LIBRARY DESTINATION ${FLTK_LIBDIR}
|
||||
ARCHIVE DESTINATION ${FLTK_LIBDIR}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
Upstream-Status: Pending
|
||||
|
||||
--- a/Makefile.orig 2015-11-26 15:35:31.485357862 +0800
|
||||
+++ b/Makefile 2015-11-26 15:35:37.037357764 +0800
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
include makeinclude
|
||||
|
||||
-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
|
||||
+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation
|
||||
|
||||
all: makeinclude fltk-config
|
||||
for dir in $(DIRS); do\
|
||||
@@ -0,0 +1,44 @@
|
||||
Upstream-Status: Inappropriate [cross build specific]
|
||||
|
||||
It fails to build fltk-native on Ubuntu 20.04 with glibc 2.31:
|
||||
|
||||
| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `fl_dlopen(char const*, char const*)':
|
||||
| Fl_Native_File_Chooser.cxx:(.text+0x61a): undefined reference to `dlopen'
|
||||
| /path_to/tmp/hosttools/ld: lib/libfltk.a(Fl_Native_File_Chooser.cxx.o): in function `Fl_GTK_File_Chooser::probe_for_GTK_libs()':
|
||||
| Fl_Native_File_Chooser.cxx:(.text+0xf92): undefined reference to `dlerror'
|
||||
|
||||
The original fix in fltk-native recipe does not work any more because '-ldl'
|
||||
appears before lib/libfltk.a and causes dlopen() unresolved. The reason why it
|
||||
doesn't fail on other hosts is that the functions dlopen(), dlerror() etc. have
|
||||
been moved to libc.so since glibc 2.34 via the commits in glibc:
|
||||
|
||||
0c1c3a771e dlfcn: Move dlopen into libc
|
||||
add8d7ea01 dlfcn: Move dlvsym into libc
|
||||
6dfc0207eb dlfcn: Move dlinfo into libc
|
||||
492560a32e dlfcn: Move dladdr1 into libc
|
||||
6a1ed32789 dlfcn: Move dlmopen into libc
|
||||
77f876c0e3 dlfcn: Move dlsym into libc
|
||||
602252b553 dlfcn: Move dladdr into libc
|
||||
d8cce17d2a dlfcn: Move dlclose into libc
|
||||
|
||||
Append 'dl' to fltk link items explictly to fix the error.
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
|
||||
---
|
||||
src/CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index d153b1c..0fe5c11 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -306,7 +306,7 @@ endif (USE_XFT)
|
||||
#######################################################################
|
||||
|
||||
FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}")
|
||||
-target_link_libraries (fltk ${OPTIONAL_LIBS})
|
||||
+target_link_libraries (fltk ${OPTIONAL_LIBS} dl)
|
||||
|
||||
#######################################################################
|
||||
|
||||
Reference in New Issue
Block a user