diff options
| author | jbeich <jbeich@FreeBSD.org> | 2017-02-04 12:16:59 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2017-02-04 12:16:59 +0800 |
| commit | 5b12d611be690b96785016b2108f13f038bc13e1 (patch) | |
| tree | 687493b71d786915123ca2b5240809001ffa425a | |
| parent | 171b2ed81a4eb22a50e8a5b24cbe16d7bd62fe7c (diff) | |
| download | freebsd-ports-gnome-5b12d611be690b96785016b2108f13f038bc13e1.tar.gz freebsd-ports-gnome-5b12d611be690b96785016b2108f13f038bc13e1.tar.zst freebsd-ports-gnome-5b12d611be690b96785016b2108f13f038bc13e1.zip | |
net-mgmt/flow-tools: respect CFLAGS and unbreak with gcc5 or later
../lib/libft.a(ftfil.o): In function `resolve_primitives':
ftfil.c:(.text+0x12bb): undefined reference to `eval_match_src_as'
ftfil.c:(.text+0x13e7): undefined reference to `eval_match_ip_prot'
ftfil.c:(.text+0x1432): undefined reference to `eval_match_ip_src_prefix_len'
[...]
PR: 216707
Reported by: antoine (via exp-run)
| -rw-r--r-- | net-mgmt/flow-tools/Makefile | 5 | ||||
| -rw-r--r-- | net-mgmt/flow-tools/files/patch-lib_Makefile.in | 11 | ||||
| -rw-r--r-- | net-mgmt/flow-tools/files/patch-src_Makefile.in | 11 |
3 files changed, 3 insertions, 24 deletions
diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile index 48eb72b8cc26..0bbd3b080e30 100644 --- a/net-mgmt/flow-tools/Makefile +++ b/net-mgmt/flow-tools/Makefile @@ -3,7 +3,7 @@ PORTNAME= flow-tools PORTVERSION= 0.68 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.eng.oar.net/pub/flow-tools/ @@ -17,9 +17,10 @@ OPTIONS_DEFINE= MYSQL OPENSSL PGSQL CONFLICTS= flow-tools-ng-[0-9]* USES= python:run -USE_GCC= any GNU_CONFIGURE= yes +CFLAGS+= -fgnu89-inline CONFIGURE_ARGS+=--localstatedir="${PREFIX}" +MAKE_ARGS= AM_CFLAGS="${CFLAGS}" SUB_FILES= pkg-install pkg-deinstall SUB_LIST= FLOW_CAPTURE_SPOOL="${FLOW_CAPTURE_SPOOL}" \ diff --git a/net-mgmt/flow-tools/files/patch-lib_Makefile.in b/net-mgmt/flow-tools/files/patch-lib_Makefile.in deleted file mode 100644 index 21aea465d5e1..000000000000 --- a/net-mgmt/flow-tools/files/patch-lib_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/Makefile.in.orig Wed Dec 20 01:38:19 2006 -+++ lib/Makefile.in Wed Dec 20 01:38:25 2006 -@@ -91,7 +91,7 @@ - - #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs - #AM_CFLAGS=-O2 --AM_CFLAGS = -g -Wall -+#AM_CFLAGS = -g -Wall - - DEFS = -I. -I$(srcdir)/lib - diff --git a/net-mgmt/flow-tools/files/patch-src_Makefile.in b/net-mgmt/flow-tools/files/patch-src_Makefile.in deleted file mode 100644 index 7e414cb892c4..000000000000 --- a/net-mgmt/flow-tools/files/patch-src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.in.orig Wed Dec 20 01:37:38 2006 -+++ src/Makefile.in Wed Dec 20 01:37:57 2006 -@@ -97,7 +97,7 @@ - - #AM_CFLAGS=-g -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs - #AM_CFLAGS=-O2 --AM_CFLAGS = -g -Wall -+#AM_CFLAGS = -g -Wall - - bin_PROGRAMS = flow-capture flow-cat flow-stat flow-print flow-dscan \ - flow-send flow-receive flow-gen flow-expire \ |