Skip to content

Commit

Permalink
net/libzmq4: Add NORM option, Disable -Werror
Browse files Browse the repository at this point in the history
- Add NORM option and helpers [1], no default.
- Backport upstream pull request #2066. [1][2]
- Override default -Werror in build.

[2] zeromq/libzmq#2066

PR:		211306 (part 1 of 2) [1]
Submitted by:	Eric Camachat <eric camachat org> [1]
MFH:		2016Q3
  • Loading branch information
koobs committed Aug 11, 2016
1 parent 34ea6de commit a06ef62
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 2 deletions.
9 changes: 7 additions & 2 deletions net/libzmq4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions net/libzmq4/distinfo
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
TIMESTAMP = 1469795631
SHA256 (zeromq-4.1.4.tar.gz) = e99f44fde25c2e4cb84ce440f87ca7d3fe3271c2b8cfbc67d55e4de25e6fe378
SIZE (zeromq-4.1.4.tar.gz) = 1400012
21 changes: 21 additions & 0 deletions net/libzmq4/files/patch-configure
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit a06ef62

Please sign in to comment.