Date: Sun, 5 Jan 2020 15:57:39 +0000 (UTC) From: Ben Woods <woodsb02@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522159 - in head/security/nmap: . files Message-ID: <202001051557.005FvdLF077641@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: woodsb02 Date: Sun Jan 5 15:57:38 2020 New Revision: 522159 URL: https://svnweb.freebsd.org/changeset/ports/522159 Log: security/nmap: Fix build on 11i386, 11arm, 11arm64 Fix patches to configure scripts to only add -libverbs if found in base PR: 242987 Reported by: Dries Michiels <driesm.michiels@gmail.com> Reported by: garga MFH: 2020Q1 Deleted: head/security/nmap/files/patch-ncat_configure head/security/nmap/files/patch-nping_configure Modified: head/security/nmap/Makefile head/security/nmap/files/patch-configure Modified: head/security/nmap/Makefile ============================================================================== --- head/security/nmap/Makefile Sun Jan 5 15:46:41 2020 (r522158) +++ head/security/nmap/Makefile Sun Jan 5 15:57:38 2020 (r522159) @@ -56,6 +56,15 @@ CONFIGURE_ARGS+=--without-localdirs \ post-extract: @${RM} -r ${WRKSRC}/mswin32 +.if exists(/usr/lib/libibverbs.a) +# Link with libibverbs is needed by static libpcap +post-patch-PCAP-on: + @${REINPLACE_CMD} -E -e "s|(PCAP_LIBS=['\"].*)(['\"])$$|\1 -libverbs\2|" \ + ${WRKSRC}/configure \ + ${WRKSRC}/nping/configure \ + ${WRKSRC}/ncat/configure +.endif + post-configure: @${REINPLACE_CMD} -e "s|^DESTDIR *=|& ${DESTDIR}|" ${WRKSRC}/Makefile Modified: head/security/nmap/files/patch-configure ============================================================================== --- head/security/nmap/files/patch-configure Sun Jan 5 15:46:41 2020 (r522158) +++ head/security/nmap/files/patch-configure Sun Jan 5 15:57:38 2020 (r522159) @@ -18,12 +18,3 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_prog_CC+:} false; then : -@@ -6365,7 +6365,7 @@ if test $have_libpcap != yes; then - else - CPPFLAGS="$CPPFLAGS -I\$(top_srcdir)/$libpcapdir" - fi -- LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a' -+ LIBPCAP_LIBS='$(LIBPCAPDIR)/libpcap.a -libverbs' - PCAP_BUILD="build-pcap" - PCAP_CLEAN="clean-pcap" - PCAP_DIST_CLEAN="distclean-pcap"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001051557.005FvdLF077641>