Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Apr 2019 13:50:53 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r499640 - branches/2019Q2/net-mgmt/dhcdrop
Message-ID:  <201904221350.x3MDorj8019629@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Mon Apr 22 13:50:53 2019
New Revision: 499640
URL: https://svnweb.freebsd.org/changeset/ports/499640

Log:
  MFH: r499639
  
  net-mgmt/dhcdrop: Fix build on FreeBSD >= 12.0 and unbreak STATIC option
  
  Add missing libibverbs dependency when linking statically.  On
  FreeBSD >= 12.0 libpcap needs libibverbs:
  
  /usr/bin/ld: error: undefined symbol: ibv_get_device_list
  >>> referenced by pcap-rdmasniff.c:370 (/usr/src/contrib/libpcap/pcap-rdmasniff.c:370)
  >>>               pcap-rdmasniff.o:(rdmasniff_create) in archive /usr/lib/libpcap.a
  
  http://beefy6.nyi.freebsd.org/data/120amd64-default/499421/logs/errors/dhcdrop-0.5_2.log
  
  While here fix the STATIC option.  Currently the port always links
  statically since --disable-static-build is broken and also enables
  static linking.
  
  Reported by:	antoine, pkg-fallout
  
  Approved by:	ports-secteam blanket

Modified:
  branches/2019Q2/net-mgmt/dhcdrop/Makefile
Directory Properties:
  branches/2019Q2/   (props changed)

Modified: branches/2019Q2/net-mgmt/dhcdrop/Makefile
==============================================================================
--- branches/2019Q2/net-mgmt/dhcdrop/Makefile	Mon Apr 22 13:31:33 2019	(r499639)
+++ branches/2019Q2/net-mgmt/dhcdrop/Makefile	Mon Apr 22 13:50:53 2019	(r499640)
@@ -3,7 +3,7 @@
 
 PORTNAME=	dhcdrop
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-mgmt sysutils
 MASTER_SITES=	http://www.netpatch.ru/projects/dhcdrop/
 
@@ -22,6 +22,16 @@ PLIST_FILES=	sbin/dhcdrop man/man8/dhcdrop.8.gz \
 OPTIONS_DEFINE=	STATIC
 STATIC_DESC=	Build a static version of dhcdrop
 
-STATIC_CONFIGURE_ENABLE=	static-build
+# --disable-static-build is broken and has the same effect as
+# --enable-static-build, so do not use STATIC_CONFIGURE_ENABLE
+# here.
+STATIC_CONFIGURE_ON=	--enable-static-build
+
+.if exists(/usr/lib/libibverbs.a)
+# Link with libibverbs too needed by static libpcap
+post-patch-STATIC-on:
+	@${REINPLACE_CMD} -e 's,^dhcdrop_LDADD.*,& -libverbs,' \
+		${WRKSRC}/src/Makefile.am
+.endif
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904221350.x3MDorj8019629>