Mon Oct 1 09:29:00 2018 UTC ()
mbuffer: Ensure LDFLAGS are used when linking.


(jperkin)
diff -r1.5 -r1.6 pkgsrc/misc/mbuffer/distinfo
diff -r1.2 -r1.3 pkgsrc/misc/mbuffer/patches/patch-Makefile.in
cvs diff -r1.5 -r1.6 pkgsrc/misc/mbuffer/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/mbuffer/distinfo 2018/09/18 09:49:29 1.5
+++ pkgsrc/misc/mbuffer/distinfo 2018/10/01 09:29:00 1.6
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.5 2018/09/18 09:49:29 fhajny Exp $ 1$NetBSD: distinfo,v 1.6 2018/10/01 09:29:00 jperkin Exp $
2 2
3SHA1 (mbuffer-20180625.tgz) = d3beb0aa92de4095bdbb819a6f0a977507155c96 3SHA1 (mbuffer-20180625.tgz) = d3beb0aa92de4095bdbb819a6f0a977507155c96
4RMD160 (mbuffer-20180625.tgz) = d3fb1e03c40719e72af852692cfcce5db0992b0c 4RMD160 (mbuffer-20180625.tgz) = d3fb1e03c40719e72af852692cfcce5db0992b0c
5SHA512 (mbuffer-20180625.tgz) = 01d712f51ac0b206d6ee91fbbd4cea4873784aaca02daa9b3d72cfcc0a63696b20c15ca4b6e834924f02f2878ac90192110df584c55fb1a65620ae8b0f7ec87e 5SHA512 (mbuffer-20180625.tgz) = 01d712f51ac0b206d6ee91fbbd4cea4873784aaca02daa9b3d72cfcc0a63696b20c15ca4b6e834924f02f2878ac90192110df584c55fb1a65620ae8b0f7ec87e
6Size (mbuffer-20180625.tgz) = 140946 bytes 6Size (mbuffer-20180625.tgz) = 140946 bytes
7SHA1 (patch-Makefile.in) = 5b1285fd94aad7c9eaf803527a514cd7385cc448 7SHA1 (patch-Makefile.in) = 0aea9d6e1bc836f671846bf29d006c56f14d3514
8SHA1 (patch-configure) = e3f9fe62c308369f89511dc31f781a92fd7b4405 8SHA1 (patch-configure) = e3f9fe62c308369f89511dc31f781a92fd7b4405
9SHA1 (patch-mbuffer.c) = ca1b0fee1a11529f787b2a2b0d6ee03ed9fcfd14 9SHA1 (patch-mbuffer.c) = ca1b0fee1a11529f787b2a2b0d6ee03ed9fcfd14
10SHA1 (patch-mbuffer.rc) = f6639110e0a30f62a8a61e725a5403c88703d671 10SHA1 (patch-mbuffer.rc) = f6639110e0a30f62a8a61e725a5403c88703d671
11SHA1 (patch-network.c) = 496fa35d88a9cdec4f7a6121c8b31a64f0ee8f57 11SHA1 (patch-network.c) = 496fa35d88a9cdec4f7a6121c8b31a64f0ee8f57
cvs diff -r1.2 -r1.3 pkgsrc/misc/mbuffer/patches/patch-Makefile.in (expand / switch to unified diff)

--- pkgsrc/misc/mbuffer/patches/patch-Makefile.in 2018/09/18 09:49:29 1.2
+++ pkgsrc/misc/mbuffer/patches/patch-Makefile.in 2018/10/01 09:29:00 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile.in,v 1.2 2018/09/18 09:49:29 fhajny Exp $ 1$NetBSD: patch-Makefile.in,v 1.3 2018/10/01 09:29:00 jperkin Exp $
2 2
3Fix install permissions. 3Fix install permissions.
4Pass sysconfdir. 4Pass sysconfdir.
5 5
6--- Makefile.in.orig 2018-06-25 20:37:20.000000000 +0000 6--- Makefile.in.orig 2018-06-25 20:37:20.000000000 +0000
7+++ Makefile.in 7+++ Makefile.in
8@@ -1,5 +1,5 @@ 8@@ -1,5 +1,5 @@
9 CC = @CC@ 9 CC = @CC@
10-DEFS = @DEFS@ -DPREFIX=\"${prefix}\" 10-DEFS = @DEFS@ -DPREFIX=\"${prefix}\"
11+DEFS = @DEFS@ -DSYSCONFDIR=\"${etcdir}\" 11+DEFS = @DEFS@ -DSYSCONFDIR=\"${etcdir}\"
12 CFLAGS = @CFLAGS@ $(DEFS) -I@srcdir@ -I. 12 CFLAGS = @CFLAGS@ $(DEFS) -I@srcdir@ -I.
13 LDFLAGS = @LDFLAGS@ 13 LDFLAGS = @LDFLAGS@
14 LIBS = @LIBS@ 14 LIBS = @LIBS@
@@ -23,13 +23,23 @@ Pass sysconfdir. @@ -23,13 +23,23 @@ Pass sysconfdir.
23  23
24 install: $(TARGET) $(DESTDIR)$(etcdir)/mbuffer.rc 24 install: $(TARGET) $(DESTDIR)$(etcdir)/mbuffer.rc
25- -$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) 25- -$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
26- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/ 26- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
27- -$(INSTALL) -d -m 755 $(DESTDIR)$(mandir) 27- -$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
28- $(INSTALL) -m 644 mbuffer.1 $(DESTDIR)$(mandir)/ 28- $(INSTALL) -m 644 mbuffer.1 $(DESTDIR)$(mandir)/
29+ -$(BSD_INSTALL_PROGRAM_DIR) -d -m 755 $(DESTDIR)$(bindir) 29+ -$(BSD_INSTALL_PROGRAM_DIR) -d -m 755 $(DESTDIR)$(bindir)
30+ $(BSD_INSTALL_PROGRAM) -m 755 $(TARGET) $(DESTDIR)$(bindir)/ 30+ $(BSD_INSTALL_PROGRAM) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
31+ -$(BSD_INSTALL_MAN_DIR) -d -m 755 $(DESTDIR)$(mandir) 31+ -$(BSD_INSTALL_MAN_DIR) -d -m 755 $(DESTDIR)$(mandir)
32+ $(BSD_INSTALL_MAN) -m 644 mbuffer.1 $(DESTDIR)$(mandir)/ 32+ $(BSD_INSTALL_MAN) -m 644 mbuffer.1 $(DESTDIR)$(mandir)/
33  33
34 lint: 34 lint:
35 lint $(DEFS) $(SOURCES) 35 lint $(DEFS) $(SOURCES)
 36@@ -157,7 +157,7 @@ test7: mbuffer
 37 ./mbuffer -P90 --md5 -i INSTALL -o /dev/null
 38
 39 tapetest.so: tapetest.c config.h
 40- $(CC) $(CFLAGS) -shared -fPIC tapetest.c -o $@ $(LIBS)
 41+ $(CC) $(LDFLAGS) $(CFLAGS) -shared -fPIC tapetest.c -o $@ $(LIBS)
 42
 43 idev.so: idev.c config.h
 44- $(CC) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)
 45+ $(CC) $(LDFLAGS) $(CFLAGS) -shared -g -fPIC idev.c -o $@ $(LIBS)