diff options
Diffstat (limited to 'meta-oe/recipes-support/fltk')
10 files changed, 119 insertions, 252 deletions
diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb index 2636287e3a..3e8e2cdf77 100644 --- a/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-oe/recipes-support/fltk/fltk-native.bb @@ -2,6 +2,8 @@ require ${BPN}.inc DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" +SRC_URI += "file://fltk-native-link-libdl.patch" + inherit native EXTRA_OECMAKE += " \ @@ -9,13 +11,13 @@ EXTRA_OECMAKE += " \ -DOPTION_USE_THREADS=OFF \ -DOPTION_USE_XDBE=OFF \ -DOPTION_USE_XFT=OFF \ - -DOPTION_BUILD_EXAMPLES=OFF \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XINERAMA=OFF \ -DOPTION_USE_XFIXES=OFF \ -DOPTION_USE_XCURSOR=OFF \ " -do_install_append() { +do_install:append() { # make sure native fltk-config is not used accidentaly rm -f ${D}${bindir}/fltk-config } diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb index 09344cf7d1..82007c4cf4 100644 --- a/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-oe/recipes-support/fltk/fltk.bb @@ -5,14 +5,12 @@ DEPENDS = "alsa-lib zlib jpeg libpng libxext libxft" inherit features_check binconfig lib_package gtk-icon-cache mime mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI += " \ - file://0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch \ - file://0004-Fix-build-error-when-enable-package-config-examples.patch \ -" +SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" EXTRA_OECMAKE = " \ -DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_USE_THREADS=ON \ + -DFLTK_BUILD_TEST=OFF \ -DOPTION_USE_XDBE=ON \ -DOPTION_USE_XFT=ON \ -DFLTK_CONFIG_PATH=${libdir}/cmake \ @@ -20,30 +18,31 @@ EXTRA_OECMAKE = " \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}" -PACKAGECONFIG[examples] = "-DOPTION_BUILD_EXAMPLES=ON,-DOPTION_BUILD_EXAMPLES=OFF,fltk-native" PACKAGECONFIG[cairo] = "-DOPTION_CAIRO=ON,-DOPTION_CAIRO=OFF,cairo" PACKAGECONFIG[opengl] = "-DOPTION_USE_GL=ON,-DOPTION_USE_GL=OFF,virtual/libgl" PACKAGECONFIG[xinerama] = "-DOPTION_USE_XINERAMA=ON,-DOPTION_USE_XINERAMA=OFF,libxinerama" PACKAGECONFIG[xfixes] = "-DOPTION_USE_XFIXES=ON,-DOPTION_USE_XFIXES=OFF,libxfixes" PACKAGECONFIG[xcursor] = "-DOPTION_USE_XCURSOR=ON,-DOPTION_USE_XCURSOR=OFF,libxcursor" -do_install_append() { - sed -i -e 's,${STAGING_DIR_HOST},,g' ${D}${bindir}/fltk-config +do_install:append() { + sed -i -e 's,${TMPDIR},,g' ${D}${bindir}/fltk-config + sed -i -e 's,${TMPDIR},,g' ${D}${datadir}/fltk/UseFLTK.cmake + sed -i -e 's,${TMPDIR},,g' ${D}${datadir}/fltk/FLTK-Targets.cmake } -python populate_packages_prepend () { +python populate_packages:prepend () { if (d.getVar('DEBIAN_NAMES')): - d.setVar('PKG_${BPN}', 'libfltk${PV}') + d.setVar('PKG:${BPN}', 'libfltk${PV}') } LEAD_SONAME = "libfltk.so" # .desktop / icons / mime only necessary for fluid app -FILES_${PN}-bin += " \ +FILES:${PN}-bin += " \ ${datadir}/applications \ ${datadir}/icons \ ${datadir}/mime \ " # cmake files -FILES_${PN}-dev += "${datadir}/fltk" +FILES:${PN}-dev += "${datadir}/fltk" diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc index 97a1fbfc7e..b1bc83578f 100644 --- a/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-oe/recipes-support/fltk/fltk.inc @@ -1,7 +1,7 @@ SUMMARY = "FLTK is a cross-platform C++ GUI toolkit" HOMEPAGE = "http://www.fltk.org" SECTION = "libs" -LICENSE = "LGPLv2 & FLTK" +LICENSE = "LGPL-2.0-only & FLTK" LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" SRC_URI = " \ @@ -11,9 +11,8 @@ SRC_URI = " \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.5" -SRC_URI[md5sum] = "0de2b45a1896be2b4a8cafae89b84248" -SRC_URI[sha256sum] = "2933c72400f9e7c0f4c3a81a1ce98bc9582b2a3edc44b8597ccd26e240e32c3c" +PV = "1.3.8" +SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d" inherit cmake pkgconfig diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch index e6e68a0cb8..d1cbb35479 100644 --- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch +++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch @@ -18,6 +18,8 @@ Content-Transfer-Encoding: 8bit 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/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch index cca977c66d..0d91aab3a1 100644 --- a/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch +++ b/meta-oe/recipes-support/fltk/fltk/0002-always-build-fluid-and-export-pointers.patch @@ -1,6 +1,6 @@ From 16010cb1a69ea2326d8102b7f1e34b65aca4b278 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 28 Feb 2017 01:20:42 +0100 +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 @@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +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 968186a..95e04eb 100644 +index 6e8bc5d..71b6f6c 100644 --- a/CMake/export.cmake +++ b/CMake/export.cmake -@@ -21,7 +21,7 @@ - # final config and export +@@ -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 +-if (CMAKE_CROSSCOMPILING) ++if (FALSE) + find_file(FLUID_PATH + NAMES fluid fluid.exe + PATHS ENV PATH -- -2.9.3 +2.31.1 diff --git a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch b/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch deleted file mode 100644 index 1f2f8aecf7..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/0003-CMake-build-Force-shared-libs-with-unsuffixed-names.patch +++ /dev/null @@ -1,41 +0,0 @@ -From bc38fb41044503c9debf5710910c51dd29674b6a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 15 Dec 2017 22:14:01 +0100 -Subject: [PATCH] CMake build: Force shared libs with unsuffixed names -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -For windows build sake CMake complains when a project wants to build shared and -static libraries with same name. This caused the authors of fltk to generate -libraries with names suffixed by '_SHARED' when building fltk with cmake - -autotools builds do not suffix. - -Reasons to build shared libs with correct names: - -* Shared libraries are the preferred choice for embedded devices -* There are projects (e.g yoshimi) expecting shared libraries with unsuffixed - names - as created by autotools build. These projects link against static - libraries by accident causing unusable binaries. - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - CMake/macros.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 4def62d..ab675f0 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -49,7 +49,7 @@ macro(FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES) - PROPERTIES - VERSION ${FLTK_VERSION_FULL} - SOVERSION ${FLTK_VERSION_MAJOR}.${FLTK_VERSION_MINOR} -- PREFIX "lib" # for MSVC static/shared coexistence -+ OUTPUT_NAME ${LIBNAME} CLEAN_DIRECT_OUTPUT 1 - ) - endif (${LIBTYPE} STREQUAL "SHARED") - --- -2.9.5 - diff --git a/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch new file mode 100644 index 0000000000..72bb48a32c --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch @@ -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 + diff --git a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch b/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch deleted file mode 100644 index 974c02fe61..0000000000 --- a/meta-oe/recipes-support/fltk/fltk/0004-Fix-build-error-when-enable-package-config-examples.patch +++ /dev/null @@ -1,182 +0,0 @@ -Fix build error when enable package config examples. - -Upstream-Status: Backport [https://github.com/fltk/fltk/commit/16774dd] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - - -From 16774ddc4e000c89e560fde0ced8be9814ef041e Mon Sep 17 00:00:00 2001 -From: Albrecht Schlosser <albrechts.fltk@online.de> -Date: Wed, 8 Feb 2017 02:06:52 +0000 -Subject: [PATCH] Rename test/help demo program to test/help_dialog. - -This change avoids a name conflict with CMake's auto-generated target 'help' -for "Unix Makefiles", "Ninja", and supposedly other generators as well. - - -git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12171 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 ---- - CMake/macros.cmake | 5 ----- - documentation/src/examples.dox | 8 +++---- - test/CMakeLists.txt | 27 +++++++++++++++++++---- - test/demo.menu | 2 +- - test/{help.cxx => help_dialog.cxx} | 6 ++--- - test/{help-test.html => help_dialog.html} | 0 - 6 files changed, 31 insertions(+), 17 deletions(-) - rename test/{help.cxx => help_dialog.cxx} (88%) - rename test/{help-test.html => help_dialog.html} (100%) - -diff --git a/CMake/macros.cmake b/CMake/macros.cmake -index 5b0d0fa..7134fcb 100644 ---- a/CMake/macros.cmake -+++ b/CMake/macros.cmake -@@ -90,11 +90,6 @@ function(CREATE_EXAMPLE NAME SOURCES LIBRARIES) - - set (tname ${NAME}) # target name - -- # rename reserved target name "help" (CMake 2.8.12 and later) -- if (${tname} MATCHES "^help$") -- set (tname "test_help") -- endif (${tname} MATCHES "^help$") -- - foreach(src ${SOURCES}) - if ("${src}" MATCHES "\\.fl$") - list(APPEND flsrcs ${src}) -diff --git a/documentation/src/examples.dox b/documentation/src/examples.dox -index 5105b7b..7961b02 100644 ---- a/documentation/src/examples.dox -+++ b/documentation/src/examples.dox -@@ -60,7 +60,7 @@ you build FLTK, unlike those in the 'test' directory shown below. - </tr> - <tr> - <td> \ref examples_hello </td> --<td> \ref examples_help </td> -+<td> \ref examples_help_dialog </td> - <td> \ref examples_iconize </td> - <td> \ref examples_image </td> - <td> \ref examples_inactive </td> -@@ -326,13 +326,13 @@ easily under FLTK. - tiny demo shows how little is needed to get a functioning application - running with FLTK. Quite impressive, I'd say. - --\subsection examples_help help -+\subsection examples_help_dialog help_dialog - - \par --\c help displays the built-in FLTK help browser. The -+\c help_dialog displays the built-in FLTK help browser. The - Fl_Help_Dialog understands a subset of html and renders - various image formats. This widget makes it easy to provide help --pages to the user without depending on the operating system's -+pages to the user without depending on the operating system's - html browser. - - \subsection examples_iconize iconize -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 22ec9ab..4caffa5 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -1,3 +1,22 @@ -+# -+# "$Id$" -+# -+# CMakeLists.txt used to build test and demo apps by the CMake build system -+# -+# Copyright 2004-2017 by Bill Spitzak and others. -+# -+# This library is free software. Distribution and use rights are outlined in -+# the file "COPYING" which should have been included with this file. If this -+# file is missing or damaged, see the license at: -+# -+# http://www.fltk.org/COPYING.php -+# -+# Please report all bugs and problems on the following page: -+# -+# http://www.fltk.org/str.php -+# -+####################################################################### -+ - set(EXECUTABLE_OUTPUT_PATH ${FLTK_BINARY_DIR}/bin/examples) - - ####################################################################### -@@ -64,7 +83,7 @@ CREATE_EXAMPLE(file_chooser file_chooser.cxx "fltk;fltk_images") - CREATE_EXAMPLE(fonts fonts.cxx fltk) - CREATE_EXAMPLE(forms forms.cxx "fltk;fltk_forms") - CREATE_EXAMPLE(hello hello.cxx fltk) --CREATE_EXAMPLE(help help.cxx "fltk;fltk_images") -+CREATE_EXAMPLE(help_dialog help_dialog.cxx "fltk;fltk_images") - CREATE_EXAMPLE(icon icon.cxx fltk) - CREATE_EXAMPLE(iconize iconize.cxx fltk) - CREATE_EXAMPLE(image image.cxx fltk) -@@ -134,7 +153,7 @@ endif(FLTK_HAVE_CAIRO) - # Note: this is incomplete as of 11 Feb 2015 - # Todo: currently all files are copied, but some of them need configuration: - # - demo.menu: fluid can't be started (wrong path) --# - demo.menu: help (help-test.html) can't find its images (not copied) -+# - demo.menu: help_dialog (help_dialog.html) can't find its images (not copied) - # - maybe more ... - - # prepare for a "better" test file installation path -@@ -149,11 +168,11 @@ configure_file(demo.menu ${TESTFILE_PATH}/demo.menu COPYONLY) - - # use target directory only to avoid redundancy - configure_file(rgb.txt ${TESTFILE_PATH} COPYONLY) --configure_file(help-test.html ${TESTFILE_PATH} COPYONLY) -+configure_file(help_dialog.html ${TESTFILE_PATH} COPYONLY) - configure_file(browser.cxx ${TESTFILE_PATH} COPYONLY) - configure_file(editor.cxx ${TESTFILE_PATH} COPYONLY) - if(APPLE AND NOT OPTION_APPLE_X11) - configure_file(browser.cxx "${TESTFILE_PATH}/browser.app/Contents/Resources/browser.cxx" COPYONLY) - configure_file(rgb.txt ${TESTFILE_PATH}/colbrowser.app/Contents/Resources/rgb.txt COPYONLY) -- configure_file(help-test.html ${TESTFILE_PATH}/help.app/Contents/Resources/help-test.html COPYONLY) -+ configure_file(help_dialog.html ${TESTFILE_PATH}/help_dialog.app/Contents/Resources/help_dialog.html COPYONLY) - endif(APPLE AND NOT OPTION_APPLE_X11) -diff --git a/test/demo.menu b/test/demo.menu -index 337a71c..97e522a 100644 ---- a/test/demo.menu -+++ b/test/demo.menu -@@ -77,7 +77,7 @@ - @o:Font Tests...:@of - @of:Fonts:fonts - @of:UTF-8:utf8 -- @o:HelpDialog:help -+ @o:HelpDialog:help_dialog - @o:Input Choice:input_choice - @o:Preferences:preferences - @o:Threading:threads -diff --git a/test/help.cxx b/test/help_dialog.cxx -similarity index 88% -rename from test/help.cxx -rename to test/help_dialog.cxx -index f5c51d6..7866641 100644 ---- a/test/help.cxx -+++ b/test/help_dialog.cxx -@@ -3,7 +3,7 @@ - // - // Fl_Help_Dialog test program. - // --// Copyright 1999-2010 by Easy Software Products. -+// Copyright 2011-2017 by Bill Spitzak and others. - // - // This library is free software. Distribution and use rights are outlined in - // the file "COPYING" which should have been included with this file. If this -@@ -46,13 +46,13 @@ main(int argc, // I - Number of command-line arguments - strcpy(buf, argv[0]); - char *slash = strrchr(buf, '/'); - if (slash) -- strcpy(slash, "/../Resources/help-test.html"); -+ strcpy(slash, "/../Resources/help_dialog.html"); - help->load(buf); - - #else - - if (argc <= 1) -- help->load("help-test.html"); -+ help->load("help_dialog.html"); - else - help->load(argv[1]); - -diff --git a/test/help-test.html b/test/help_dialog.html -similarity index 100% -rename from test/help-test.html -rename to test/help_dialog.html diff --git a/meta-oe/recipes-support/fltk/fltk/disable_test.patch b/meta-oe/recipes-support/fltk/fltk/disable_test.patch index 1f5fd25e04..fe8be5a652 100644 --- a/meta-oe/recipes-support/fltk/fltk/disable_test.patch +++ b/meta-oe/recipes-support/fltk/fltk/disable_test.patch @@ -1,3 +1,5 @@ +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 @@ diff --git a/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch new file mode 100644 index 0000000000..e140ce2166 --- /dev/null +++ b/meta-oe/recipes-support/fltk/fltk/fltk-native-link-libdl.patch @@ -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) + + ####################################################################### + |