Thu Jul 13 12:04:37 2017 UTC ()
Honor LDFLAGS. Fixes RELRO build.


(wiz)
diff -r1.20 -r1.21 pkgsrc/audio/ocp/Makefile
diff -r1.8 -r1.9 pkgsrc/audio/ocp/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/audio/ocp/patches/patch-ad
cvs diff -r1.20 -r1.21 pkgsrc/audio/ocp/Makefile (expand / switch to context diff)
--- pkgsrc/audio/ocp/Makefile 2016/03/03 19:35:13 1.20
+++ pkgsrc/audio/ocp/Makefile 2017/07/13 12:04:37 1.21
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/03/03 19:35:13 shattered Exp $
+# $NetBSD: Makefile,v 1.21 2017/07/13 12:04:37 wiz Exp $
 
 DISTNAME=		ocp-0.1.21
 PKGREVISION=		7
@@ -32,6 +32,12 @@
 CFLAGS.SunOS+=		-DSOUND_PCM_WRITE_RATE=SNDCTL_DSP_SPEED
 
 PLIST_VARS+=		sdl x11 desktop
+
+SUBST_CLASSES+=		ldflags
+SUBST_SED.ldflags+=	-e 's/$$(SHARED_FLAGS)/$$(LDFLAGS) $$(SHARED_FLAGS)/g'
+SUBST_FILES.ldflags+=	*/Makefile
+SUBST_MESSAGE.ldflags=	Honoring LDFLAGS.
+SUBST_STAGE.ldflags=	pre-build
 
 .include "options.mk"
cvs diff -r1.8 -r1.9 pkgsrc/audio/ocp/distinfo (expand / switch to context diff)
--- pkgsrc/audio/ocp/distinfo 2016/04/12 06:33:42 1.8
+++ pkgsrc/audio/ocp/distinfo 2017/07/13 12:04:37 1.9
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2016/04/12 06:33:42 wiz Exp $
+$NetBSD: distinfo,v 1.9 2017/07/13 12:04:37 wiz Exp $
 
 SHA1 (ocp-0.1.21.tar.bz2) = aaa16cf1979c572b09c73e7cc61350bfc4477380
 RMD160 (ocp-0.1.21.tar.bz2) = 6b42e93e9fe5879e844b2d336825a2db156b7e6f
@@ -6,7 +6,7 @@
 Size (ocp-0.1.21.tar.bz2) = 781805 bytes
 SHA1 (patch-ab) = d33aad7cfa41330c5cb026a7d3e92545f741f429
 SHA1 (patch-ac) = f28f3ebc5e3d61858f2f5bed79094fff57130da6
-SHA1 (patch-ad) = 1a3e3aa02eeae905faebac7fc7fc27eb93fa0e46
+SHA1 (patch-ad) = 5252050662343fa2575d84e883f8d157b4a2de0e
 SHA1 (patch-ae) = 00f5b6edaf0dcb2200f8e9f14ab6a8e1a9711f65
 SHA1 (patch-af) = dbb7b2d1b7a5f35c14477725ad18e31b2af787b9
 SHA1 (patch-configure) = 521884c80ef507149afa75841a62c35a42739377
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/ocp/patches/patch-ad (expand / switch to context diff)
--- pkgsrc/audio/ocp/patches/patch-ad 2009/08/16 15:52:11 1.1.1.1
+++ pkgsrc/audio/ocp/patches/patch-ad 2017/07/13 12:04:37 1.2
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $
+$NetBSD: patch-ad,v 1.2 2017/07/13 12:04:37 wiz Exp $
 
 --- devs/Makefile.orig	2008-01-14 18:48:59.000000000 +0000
 +++ devs/Makefile
@@ -7,7 +7,7 @@
  devsoss_so=devsoss.o
  devsoss$(LIB_SUFFIX): $(devsoss_so)
 -	$(CC) $(SHARED_FLAGS) $(OSS_LIBS) -o $@ $^
-+	$(CC) $(SHARED_FLAGS) $(LIBOSSAUDIO) -o $@ $^
++	$(CC) $(SHARED_FLAGS) $(LDFLAGS) $(LIBOSSAUDIO) -o $@ $^
  
  clean:
  	rm -f *.o *$(LIB_SUFFIX)