CVS commit: pkgsrc/net/rtmpdump

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Jul 13 13:19:59 UTC 2017

Modified Files:
        pkgsrc/net/rtmpdump: distinfo
        pkgsrc/net/rtmpdump/patches: patch-Makefile patch-librtmp_Makefile

Log Message:
Honor LDFLAGS. Fixes RELRO build.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/rtmpdump/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/rtmpdump/patches/patch-Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/rtmpdump/distinfo
diff -u pkgsrc/net/rtmpdump/distinfo:1.6 pkgsrc/net/rtmpdump/distinfo:1.7
--- pkgsrc/net/rtmpdump/distinfo:1.6    Wed Nov  4 00:35:34 2015
+++ pkgsrc/net/rtmpdump/distinfo        Thu Jul 13 13:19:59 2017
@@ -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

Index: pkgsrc/net/rtmpdump/patches/patch-Makefile
diff -u pkgsrc/net/rtmpdump/patches/patch-Makefile:1.4 pkgsrc/net/rtmpdump/patches/patch-Makefile:1.5
--- pkgsrc/net/rtmpdump/patches/patch-Makefile:1.4      Tue Mar 26 08:17:22 2013
+++ pkgsrc/net/rtmpdump/patches/patch-Makefile  Thu Jul 13 13:19:59 2017
@@ -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

Index: pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile
diff -u pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile:1.3 pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile:1.4
--- pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile:1.3      Tue Mar 26 08:17:22 2013
+++ pkgsrc/net/rtmpdump/patches/patch-librtmp_Makefile  Thu Jul 13 13:19:59 2017
@@ -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