From b1267fed20c50fd37ae8aa35a9ee14c84c7ed5e1 Mon Sep 17 00:00:00 2001 From: dmiller Date: Sat, 29 Jul 2017 19:16:58 +0000 Subject: [PATCH] Build with static libz and libssh2 when bundling for macOS --- macosx/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/macosx/Makefile b/macosx/Makefile index 3f2f20582..7ce02fd06 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -77,6 +77,7 @@ MAC_FLAGS = -lsasl2 -liconv -framework CoreFoundation -framework Security # Jhbuild static libraries PYTHON = $(JHBUILD_PREFIX)/bin/python2.7 OPENSSL_STATIC = $(JHBUILD_PREFIX)/lib/libssl.a $(JHBUILD_PREFIX)/lib/libcrypto.a +LIBZ_STATIC = $(JHBUILD_PREFIX)/lib/libz.a SVN_STATIC = $(JHBUILD_PREFIX)/lib/libsvn_client-1.a \ $(JHBUILD_PREFIX)/lib/libsvn_wc-1.a \ $(JHBUILD_PREFIX)/lib/libsvn_diff-1.a \ @@ -171,10 +172,11 @@ export-%: svn export .. $* stage-nmap: export-$(NMAP_BUILD_DIR) - cd $(NMAP_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --without-nping --without-nmap-update --with-openssl="$(JHBUILD_PREFIX)" $(CONFIGURE_ARGS) - make -C $(NMAP_BUILD_DIR) OPENSSL_LIBS="$(OPENSSL_STATIC)" + cd $(NMAP_BUILD_DIR) && ./configure --without-zenmap --without-ncat --without-ndiff --without-nping --without-nmap-update --with-openssl="$(JHBUILD_PREFIX)" --with-libz="$(JHBUILD_PREFIX)" $(CONFIGURE_ARGS) + # LIB* is libssh2's name for *_LIBS + make -C $(NMAP_BUILD_DIR) OPENSSL_LIBS="$(OPENSSL_STATIC)" LIBSSL="$(OPENSSL_STATIC)" ZLIB_LIBS="$(LIBZ_STATIC)" LIBZ="$(LIBZ_STATIC)" rm -rf $(NMAP_STAGING_DIR) - make -C $(NMAP_BUILD_DIR) install DESTDIR="`pwd`/$(NMAP_STAGING_DIR)" OPENSSL_LIBS="$(OPENSSL_STATIC)" + make -C $(NMAP_BUILD_DIR) install DESTDIR="`pwd`/$(NMAP_STAGING_DIR)" OPENSSL_LIBS="$(OPENSSL_STATIC)" ZLIB_LIBS="$(LIBZ_STATIC)" stage-ncat: export-$(NCAT_BUILD_DIR) cd $(NCAT_BUILD_DIR) && ./configure --without-zenmap --with-ncat --without-ndiff --without-nping --without-nmap-update --with-openssl="$(JHBUILD_PREFIX)" $(CONFIGURE_ARGS)