diff options
| author | wiz <wiz@pkgsrc.org> | 2017-07-13 13:19:59 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-07-13 13:19:59 +0000 |
| commit | e09bc09ec82d054d7352dd6cee5085d21697ba10 (patch) | |
| tree | c95b71435a09ca8b8eb16c1e31daa4634bc6e0c8 | |
| parent | b6a6355a7436516b1a09faea2033b5fb519ee1db (diff) | |
| download | pkgsrc-e09bc09ec82d054d7352dd6cee5085d21697ba10.tar.gz | |
Honor LDFLAGS. Fixes RELRO build.
| -rw-r--r-- | net/rtmpdump/distinfo | 6 | ||||
| -rw-r--r-- | net/rtmpdump/patches/patch-Makefile | 10 | ||||
| -rw-r--r-- | net/rtmpdump/patches/patch-librtmp_Makefile | 20 |
3 files changed, 27 insertions, 9 deletions
diff --git a/net/rtmpdump/distinfo b/net/rtmpdump/distinfo index 763d8540a7e..d7169870c43 100644 --- a/net/rtmpdump/distinfo +++ b/net/rtmpdump/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2015/11/04 00:35:34 agc Exp $ +$NetBSD: distinfo,v 1.7 2017/07/13 13:19:59 wiz Exp $ SHA1 (rtmpdump-2.4.tar.gz) = 975f8c79788d1f9fcc66f572509f0203982b17ac RMD160 (rtmpdump-2.4.tar.gz) = a8cf22e88e544061f15769e758754b028f1be7ff SHA512 (rtmpdump-2.4.tar.gz) = a6253af95492739366dce620a2a6cc6f4f18d7f12f9ef2c747240259066ca135beeb02091d0f3dd8380c0c294a30d3f702ad3fad1dee1db4e70473078fb81609 Size (rtmpdump-2.4.tar.gz) = 134558 bytes -SHA1 (patch-Makefile) = db528f2b97bf7f4500cce26c34e5b3929019fd9a -SHA1 (patch-librtmp_Makefile) = 23fea1ed2b7cd5be7406687c6c4cc34b40de5de5 +SHA1 (patch-Makefile) = 21c888a0b864d692595fb8a4a60c1bef3e2fca0c +SHA1 (patch-librtmp_Makefile) = a44cd464e56230a76143f0d5130190c0cc7dc7a9 diff --git a/net/rtmpdump/patches/patch-Makefile b/net/rtmpdump/patches/patch-Makefile index 1a16b099645..4c770745d99 100644 --- a/net/rtmpdump/patches/patch-Makefile +++ b/net/rtmpdump/patches/patch-Makefile @@ -1,10 +1,18 @@ -$NetBSD: patch-Makefile,v 1.4 2013/03/26 08:17:22 sbd Exp $ +$NetBSD: patch-Makefile,v 1.5 2017/07/13 13:19:59 wiz Exp $ * Pass LDFLAGS to linker * Libtoolize --- Makefile.orig 2011-07-12 00:24:33.000000000 +0000 +++ Makefile +@@ -1,6 +1,6 @@ + VERSION=v2.4 + +-prefix=/usr/local ++prefix=/usr/pkg + + CC=$(CROSS_COMPILE)gcc + LD=$(CROSS_COMPILE)ld @@ -22,11 +22,11 @@ CRYPTO_DEF=$(DEF_$(CRYPTO)) DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) OPT=-O2 diff --git a/net/rtmpdump/patches/patch-librtmp_Makefile b/net/rtmpdump/patches/patch-librtmp_Makefile index cf6ebb69425..4b08421e65d 100644 --- a/net/rtmpdump/patches/patch-librtmp_Makefile +++ b/net/rtmpdump/patches/patch-librtmp_Makefile @@ -1,10 +1,14 @@ -$NetBSD: patch-librtmp_Makefile,v 1.3 2013/03/26 08:17:22 sbd Exp $ +$NetBSD: patch-librtmp_Makefile,v 1.4 2017/07/13 13:19:59 wiz Exp $ Libtoolize --- librtmp/Makefile.orig 2011-07-12 00:24:33.000000000 +0000 +++ librtmp/Makefile -@@ -5,7 +5,7 @@ prefix=/usr/local +@@ -1,11 +1,11 @@ + VERSION=v2.4 + + prefix=/usr/local + incdir=$(prefix)/include/librtmp bindir=$(prefix)/bin libdir=$(prefix)/lib @@ -13,7 +17,13 @@ Libtoolize BINDIR=$(DESTDIR)$(bindir) INCDIR=$(DESTDIR)$(incdir) LIBDIR=$(DESTDIR)$(libdir) -@@ -73,23 +73,35 @@ LDFLAGS=$(XLDFLAGS) +@@ -68,28 +68,40 @@ SO_INST=$(SOINST_$(SHARED)) + DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" $(CRYPTO_DEF) $(XDEF) + OPT=-O2 + CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT) $(SO_DEF) +-LDFLAGS=$(XLDFLAGS) ++LDFLAGS+=$(XLDFLAGS) + OBJS=rtmp.o log.o amf.o hashswf.o parseurl.o @@ -27,14 +37,14 @@ Libtoolize - $(AR) rs $@ $? +librtmp.la: $(OBJS) + ${LIBTOOL} --mode=link --tag=CC \ -+ ${CC} -o ${.TARGET:.a=.la} \ ++ ${CC} ${LDFLAGS} -o ${.TARGET:.a=.la} \ + ${OBJS:.o=.lo} \ + -rpath ${PREFIX}/lib librtmp.$(SO_EXT): $(OBJS) - $(CC) $(SO_LDFLAGS) $(LDFLAGS) -o $@ $^ $> $(CRYPTO_LIB) + ${LIBTOOL} --mode=link --tag=CC \ -+ ${CC} -o ${.TARGET:.a=.la} \ ++ ${CC} ${LDFLAGS} -o ${.TARGET:.a=.la} \ + ${OBJS:.o=.lo} \ + -rpath ${PREFIX}/lib \ + -version-info 0:0 |