diff options
author | wiz <wiz@pkgsrc.org> | 2017-07-15 18:12:51 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-07-15 18:12:51 +0000 |
commit | 790db551ec690cd90c759d5a57588ef6e469a6c6 (patch) | |
tree | c407d7892ce018d25a32664e30795c9f9c57ed95 /audio/ladspa/patches/patch-aa | |
parent | aa1d8e2d423e1a4964ba56c61bcf0c4e2a69a641 (diff) | |
download | pkgsrc-790db551ec690cd90c759d5a57588ef6e469a6c6.tar.gz |
Fix LDFLAGS handling. Fixes RELRO build.
Funny how LDFLAGS passed to ld(1) doesn't work.
Diffstat (limited to 'audio/ladspa/patches/patch-aa')
-rw-r--r-- | audio/ladspa/patches/patch-aa | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/audio/ladspa/patches/patch-aa b/audio/ladspa/patches/patch-aa index ce535e3ccc2..6852b4540b6 100644 --- a/audio/ladspa/patches/patch-aa +++ b/audio/ladspa/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2009/08/16 14:17:44 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2017/07/15 18:12:51 wiz Exp $ --- makefile.orig 2007-11-06 10:42:45.000000000 +0000 +++ makefile @@ -37,14 +37,20 @@ $NetBSD: patch-aa,v 1.4 2009/08/16 14:17:44 wiz Exp $ ############################################################################### # -@@ -38,8 +38,8 @@ CPP = c++ - $(LD) -o ../plugins/$*.so plugins/$*.o -shared +@@ -34,12 +34,12 @@ CPP = c++ + # + + ../plugins/%.so: plugins/%.c ladspa.h +- $(CC) $(CFLAGS) -o plugins/$*.o -c plugins/$*.c +- $(LD) -o ../plugins/$*.so plugins/$*.o -shared ++ $(CC) $(CFLAGS) $(LDFLAGS) -o plugins/$*.o -c plugins/$*.c ++ $(LD) $(REAL_LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared ../plugins/%.so: plugins/%.cpp ladspa.h - $(CPP) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp - $(CPP) -o ../plugins/$*.so plugins/$*.o -shared + $(CXX) $(CXXFLAGS) -o plugins/$*.o -c plugins/$*.cpp -+ $(CXX) -o ../plugins/$*.so plugins/$*.o -shared ++ $(CXX) $(LDFLAGS) -o ../plugins/$*.so plugins/$*.o -shared ############################################################################### # @@ -78,3 +84,24 @@ $NetBSD: patch-aa,v 1.4 2009/08/16 14:17:44 wiz Exp $ ############################################################################### # +@@ -90,17 +90,17 @@ targets: $(PLUGINS) $(PROGRAMS) + # + + ../bin/applyplugin: applyplugin.o load.o default.o +- $(CC) $(CFLAGS) $(LIBRARIES) \ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARIES) \ + -o ../bin/applyplugin \ + applyplugin.o load.o default.o + + ../bin/analyseplugin: analyseplugin.o load.o default.o +- $(CC) $(CFLAGS) $(LIBRARIES) \ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARIES) \ + -o ../bin/analyseplugin \ + analyseplugin.o load.o default.o + + ../bin/listplugins: listplugins.o search.o +- $(CC) $(CFLAGS) $(LIBRARIES) \ ++ $(CC) $(CFLAGS) $(LDFLAGS) $(LIBRARIES) \ + -o ../bin/listplugins \ + listplugins.o search.o + |