summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2015-12-19 19:10:56 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-12-20 13:56:01 +0100
commitbff7b75552ade4fcafd2adb991e0418ca8fe9196 (patch)
treee49c69bd35004ff2e6c82441af57ad3c335bd14e
parent1e3d2cad8daa59ccf64b1f47a1e1ab95b0f9b784 (diff)
downloadbuildroot-bff7b75552ade4fcafd2adb991e0418ca8fe9196.tar.gz
buildroot-bff7b75552ade4fcafd2adb991e0418ca8fe9196.zip
package/nut: disable libltdl (and nut-scanner) for static-only
nut-scanner needs libltdl, a wrapper around dlopen/dlsym. This does not really make sense on a static-only build. Disable use of libltdl in static-only builds; this disble nut-scanner. Fixes: http://autobuild.buildroot.org/results/d8e/d8e769709681b1965f36eb5c27f71f3a1f5adcf1/ http://autobuild.buildroot.org/results/6e4/6e403642069093389acbeeccd7030b76d4ab68be/ http://autobuild.buildroot.org/results/fa4/fa4c647ce58b91b863d8de5bf9d44b2060a1cf1c/ and so many others... Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/nut/nut.mk7
1 files changed, 5 insertions, 2 deletions
diff --git a/package/nut/nut.mk b/package/nut/nut.mk
index d5babee2b5..b0a92ca660 100644
--- a/package/nut/nut.mk
+++ b/package/nut/nut.mk
@@ -50,8 +50,11 @@ else
NUT_CONF_OPTS += --without-cgi
endif
-# libltdl (libtool) is needed for nut-scanner
-ifeq ($(BR2_PACKAGE_LIBTOOL),y)
+# nut-scanner needs libltdl, which is a wrapper arounf dlopen/dlsym,
+# so is not available for static-only builds.
+# There is no flag to directly enable/disable nut-scanner, it's done
+# via the --enable/disable-libltdl flag.
+ifeq ($(BR2_STATIC_LIBS):$(BR2_PACKAGE_LIBTOOL),:y)
NUT_DEPENDENCIES += libtool
NUT_CONF_OPTS += --with-libltdl
else
OpenPOWER on IntegriCloud