CVS commit: pkgsrc/audio/ladspa

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat Jul 15 18:12:51 UTC 2017

Modified Files:
        pkgsrc/audio/ladspa: Makefile distinfo
        pkgsrc/audio/ladspa/patches: patch-aa

Log Message:
Fix LDFLAGS handling. Fixes RELRO build.

Funny how LDFLAGS passed to ld(1) doesn't work.


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/audio/ladspa/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/ladspa/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/ladspa/patches/patch-aa

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

Modified files:

Index: pkgsrc/audio/ladspa/Makefile
diff -u pkgsrc/audio/ladspa/Makefile:1.12 pkgsrc/audio/ladspa/Makefile:1.13
--- pkgsrc/audio/ladspa/Makefile:1.12   Wed Sep 12 00:24:40 2012
+++ pkgsrc/audio/ladspa/Makefile        Sat Jul 15 18:12:51 2017
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2012/09/12 00:24:40 asau Exp $
-#
+# $NetBSD: Makefile,v 1.13 2017/07/15 18:12:51 wiz Exp $
 
 DISTNAME=      ladspa_sdk_1.13
 PKGNAME=       ${DISTNAME:S/_sdk_/-/}
@@ -21,6 +20,8 @@ MAKE_FILE=    makefile
 BUILDLINK_LIBS.dl+=    ${BUILDLINK_LDADD.dl}
 
 INSTALLATION_DIRS+=    bin include lib
+REAL_LDFLAGS=  ${LDFLAGS:S/-Wl,-z,/-z /g}
+MAKEFLAGS+=    REAL_LDFLAGS=${REAL_LDFLAGS:Q}
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/audio/ladspa/distinfo
diff -u pkgsrc/audio/ladspa/distinfo:1.10 pkgsrc/audio/ladspa/distinfo:1.11
--- pkgsrc/audio/ladspa/distinfo:1.10   Tue Nov  3 01:12:35 2015
+++ pkgsrc/audio/ladspa/distinfo        Sat Jul 15 18:12:51 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2015/11/03 01:12:35 agc Exp $
+$NetBSD: distinfo,v 1.11 2017/07/15 18:12:51 wiz Exp $
 
 SHA1 (ladspa_sdk_1.13.tgz) = 2b69e28afb62c0d97943124f48ed82de796f83ed
 RMD160 (ladspa_sdk_1.13.tgz) = e9eeae8edd24a6890fac3e34c4b55f844f44f8a0
 SHA512 (ladspa_sdk_1.13.tgz) = a1dab807fda58e08869d3f519be5fa91c394690eb13006fbe7f20b332548e4676b32b01273f5695bf36c8da72190c07618662a76d50f991b3f05068ac2b346ef
 Size (ladspa_sdk_1.13.tgz) = 70540 bytes
-SHA1 (patch-aa) = 7d09109572f9da19aac4104437704d731fc3ff99
+SHA1 (patch-aa) = bdfb2e82d2f7800a16275cb521f42f20799d998d
 SHA1 (patch-ab) = 1ad33baf6dcc4633e1459b6585cc8ccada57831f
 SHA1 (patch-ac) = 40108e5e4fdba9b2be322d0de532a97322d22325

Index: pkgsrc/audio/ladspa/patches/patch-aa
diff -u pkgsrc/audio/ladspa/patches/patch-aa:1.4 pkgsrc/audio/ladspa/patches/patch-aa:1.5
--- pkgsrc/audio/ladspa/patches/patch-aa:1.4    Sun Aug 16 14:17:44 2009
+++ pkgsrc/audio/ladspa/patches/patch-aa        Sat Jul 15 18:12:51 2017
@@ -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
  
  ###############################################################################
  #
-@@ -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
  
  ###############################################################################
  #
+@@ -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
+