diff options
author | wiz <wiz@pkgsrc.org> | 2017-07-13 12:04:37 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-07-13 12:04:37 +0000 |
commit | 2d2280bc5725841ed8ed43664bc74b9ba9effc88 (patch) | |
tree | 3e658d6c366277c513e7b863362067fd11592c01 /audio | |
parent | c1c59b35472630b6525779a9775d614dac463f59 (diff) | |
download | pkgsrc-2d2280bc5725841ed8ed43664bc74b9ba9effc88.tar.gz |
Honor LDFLAGS. Fixes RELRO build.
Diffstat (limited to 'audio')
-rw-r--r-- | audio/ocp/Makefile | 8 | ||||
-rw-r--r-- | audio/ocp/distinfo | 4 | ||||
-rw-r--r-- | audio/ocp/patches/patch-ad | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/audio/ocp/Makefile b/audio/ocp/Makefile index 6125c7e54c1..60f5e4e0457 100644 --- a/audio/ocp/Makefile +++ b/audio/ocp/Makefile @@ -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 @@ -33,6 +33,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" .include "../../audio/libid3tag/buildlink3.mk" diff --git a/audio/ocp/distinfo b/audio/ocp/distinfo index 4e10b4470dc..0a934fda675 100644 --- a/audio/ocp/distinfo +++ b/audio/ocp/distinfo @@ -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 @@ SHA512 (ocp-0.1.21.tar.bz2) = fec0123b61163780d8133939df2a0219c98b533a7a6eb477ee 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 diff --git a/audio/ocp/patches/patch-ad b/audio/ocp/patches/patch-ad index e64b7be2c37..d8a4055f348 100644 --- a/audio/ocp/patches/patch-ad +++ b/audio/ocp/patches/patch-ad @@ -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 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/08/16 15:52:11 wiz Exp $ 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) |