svn commit: r420056 - in head/net/libzmq4: . files
Kubilay Kocak
koobs at FreeBSD.org
Thu Aug 11 10:27:28 UTC 2016
Author: koobs
Date: Thu Aug 11 10:27:27 2016
New Revision: 420056
URL: https://svnweb.freebsd.org/changeset/ports/420056
Log:
net/libzmq4: Add NORM option, Disable -Werror
- Add NORM option and helpers [1], no default.
- Backport upstream pull request #2066. [1][2]
- Override default -Werror in build.
[2] https://github.com/zeromq/libzmq/pull/2066
PR: 211306 (part 1 of 2) [1]
Submitted by: Eric Camachat <eric camachat org> [1]
MFH: 2016Q3
Added:
head/net/libzmq4/files/
head/net/libzmq4/files/patch-configure (contents, props changed)
Modified:
head/net/libzmq4/Makefile
head/net/libzmq4/distinfo
Modified: head/net/libzmq4/Makefile
==============================================================================
--- head/net/libzmq4/Makefile Thu Aug 11 09:40:58 2016 (r420055)
+++ head/net/libzmq4/Makefile Thu Aug 11 10:27:27 2016 (r420056)
@@ -2,7 +2,7 @@
PORTNAME= libzmq4
PORTVERSION= 4.1.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://download.zeromq.org/
DISTNAME= zeromq-${DISTVERSION}
@@ -19,11 +19,12 @@ USES= libtool pkgconfig
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-OPTIONS_DEFINE= CURVE DEBUG PGM
+OPTIONS_DEFINE= CURVE DEBUG PGM NORM
OPTIONS_DEFAULT= CURVE PGM
CURVE_DESC= CURVE security mechanism via libsodium
PGM_DESC= Reliable multicast transport using PGM via OpenPGM
+NORM_DESC= Reliable multicast transport using NORM via NRL
CURVE_CONFIGURE_WITH= libsodium
CURVE_LIB_DEPENDS= libsodium.so:security/libsodium
@@ -34,9 +35,13 @@ DEBUG_VARS= WITH_DEBUG=yes
PGM_CONFIGURE_WITH= pgm
PGM_LIB_DEPENDS= libpgm.so:net/openpgm
+NORM_CONFIGURE_WITH= norm=${PREFIX}
+NORM_LIB_DEPENDS= libnorm.so:net/norm
+
CONFIGURE_ARGS+= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
CFLAGS+= -Wno-long-long
+CPPFLAGS+= -Wno-error
MAKE_ENV= V=1
INSTALL_TARGET= install-strip
Modified: head/net/libzmq4/distinfo
==============================================================================
--- head/net/libzmq4/distinfo Thu Aug 11 09:40:58 2016 (r420055)
+++ head/net/libzmq4/distinfo Thu Aug 11 10:27:27 2016 (r420056)
@@ -1,2 +1,3 @@
+TIMESTAMP = 1469795631
SHA256 (zeromq-4.1.4.tar.gz) = e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378
SIZE (zeromq-4.1.4.tar.gz) = 1400012
Added: head/net/libzmq4/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/libzmq4/files/patch-configure Thu Aug 11 10:27:27 2016 (r420056)
@@ -0,0 +1,21 @@
+# https://github.com/zeromq/libzmq/pull/2066
+# From 07d00b3aaa2a194c18628ae247dbfd46b9c306ae Mon Sep 17 00:00:00 2001
+# From: Eric Camachat <eric camachat org>
+# Date: Wed, 27 Jul 2016 11:09:19 -0700
+# Subject: [PATCH] Fix build with NORM enabled on FreeBSD.
+
+--- configure.orig 2016-07-29 12:36:40 UTC
++++ configure
+@@ -19823,10 +19823,10 @@ $as_echo "#define ZMQ_HAVE_NORM 1" >>con
+ if test "x$wwith_norm_ext" != "xyes"; then
+ norm_path="${with_norm_ext}"
+ LIBZMQ_EXTRA_CXXFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_CXXFLAGS}"
+- LIBZMQ_EXTRA_LDFLAGS="-I${norm_path}/include ${LIBZMQ_EXTRA_LDFLAGS}"
++ LIBZMQ_EXTRA_LDFLAGS="-I${norm_path}/lib ${LIBZMQ_EXTRA_LDFLAGS}"
+ fi
+
+- LIBS="-lnorm $LIBS"
++ LIBS="-L${norm_path}/lib -lnorm $LIBS"
+ fi
+
+ # Set -Wall, -Werror and -pedantic
More information about the svn-ports-all
mailing list