[Buildroot] [git commit branch/next] package/nmap: Fix static linking

Peter Korsgaard peter at korsgaard.com
Sat Aug 8 10:56:19 UTC 2015


commit: http://git.buildroot.net/buildroot/commit/?id=58af3f27dff51c19a97e850ea53fcf4d7bb650c5
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next

Fixes
http://autobuild.buildroot.net/results/040/040129539257d88d9437d113752bc8634fd9b2b2/
http://autobuild.buildroot.net/results/73a/73a562a3a1f356c1a39b2fb57f0848c4b99fe8b1/
http://autobuild.buildroot.net/results/767/767b8eafe7a204327eaa182c065ca5cfff18096f/
http://autobuild.buildroot.net/results/0f7/0f7f3a56815dc6422a466fe9b4357ace98f78e11/

[Peter: add host-pkgconf to _DEPENDENCIES]
Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 package/nmap/nmap.mk |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/package/nmap/nmap.mk b/package/nmap/nmap.mk
index c8c16e6..d46d58b 100644
--- a/package/nmap/nmap.mk
+++ b/package/nmap/nmap.mk
@@ -14,6 +14,13 @@ NMAP_CONF_OPTS = --without-liblua --without-zenmap \
 NMAP_LICENSE = GPLv2
 NMAP_LICENSE_FILES = COPYING
 
+# needed by libpcap
+NMAP_LIBS_FOR_STATIC_LINK += $(shell $(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs)
+
+ifeq ($(BR2_STATIC_LIBS),y)
+NMAP_CONF_ENV += LIBS='$(NMAP_LIBS_FOR_STATIC_LINK)'
+endif
+
 # for 0001-libdnet-wrapper-configure.patch
 define NMAP_WRAPPER_EXEC
 	chmod +x $(@D)/libdnet-stripped/configure.gnu
@@ -22,7 +29,8 @@ NMAP_POST_PATCH_HOOKS += NMAP_WRAPPER_EXEC
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 NMAP_CONF_OPTS += --with-openssl="$(STAGING_DIR)/usr"
-NMAP_DEPENDENCIES += openssl
+NMAP_DEPENDENCIES += host-pkgconf openssl
+NMAP_LIBS_FOR_STATIC_LINK += $(shell $(PKG_CONFIG_HOST_BINARY) --libs --static openssl)
 else
 NMAP_CONF_OPTS += --without-openssl
 endif


More information about the buildroot mailing list