link helper library before shared libraries, otherwise clang + binutils

will choke on the duplicate use of the same global symbols (`blocks' etc.)
This commit is contained in:
naddy 2017-07-31 19:18:48 +00:00
parent bb800ec98d
commit 9f3ebd1b00
2 changed files with 15 additions and 4 deletions

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2016/08/12 21:38:52 steven Exp $
# $OpenBSD: Makefile,v 1.22 2017/07/31 19:18:48 naddy Exp $
COMMENT = Audit Record Generation and Utilization System
DISTNAME = argus-3.0.8.2
REVISION = 0
CATEGORIES = net
HOMEPAGE = http://qosient.com/argus/

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-argus_Makefile_in,v 1.2 2012/07/08 19:20:58 steven Exp $
--- argus/Makefile.in.orig Wed Jan 4 01:15:19 2012
+++ argus/Makefile.in Wed Jun 27 22:27:06 2012
$OpenBSD: patch-argus_Makefile_in,v 1.3 2017/07/31 19:18:48 naddy Exp $
Index: argus/Makefile.in
--- argus/Makefile.in.orig
+++ argus/Makefile.in
@@ -19,6 +19,7 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
@ -18,3 +19,12 @@ $OpenBSD: patch-argus_Makefile_in,v 1.2 2012/07/08 19:20:58 steven Exp $
#DEFS = -DARGUSPERFMETRICS=1 @DEFS@
@@ -84,7 +85,7 @@ PROG = @INSTALL_BIN@/argus
OBJ = $(SRC:.c=.o)
-LIB = @LIBS@ @V_THREADS@ $(WRAPLIBS) $(SASLLIBS) $(COMPATLIB) ../lib/argus_common.a -lm
+LIB = ../lib/argus_common.a @LIBS@ @V_THREADS@ $(WRAPLIBS) $(SASLLIBS) $(COMPATLIB) -lm
HDR = pcap.h pcap-int.h pcap-namedb.h pcap-nit.h pcap-pf.h \
ethertype.h gencode.h gnuc.h