[SCM] ladspa-sdk/master: Correct linking order to fix FTBFS with GCC4.5 + binutils-gold.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Dec 4 00:51:35 UTC 2010


The following commit has been merged in the master branch:
commit 28c846ae5829e8839bd611a2684f264f6857cef5
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 4 01:51:06 2010 +0100

    Correct linking order to fix FTBFS with GCC4.5 + binutils-gold.

diff --git a/debian/patches/05_linking_order.diff b/debian/patches/05_linking_order.diff
new file mode 100644
index 0000000..8b1057c
--- /dev/null
+++ b/debian/patches/05_linking_order.diff
@@ -0,0 +1,38 @@
+Description: Correct linking order to prevent FTBFS with GCC4.5 + binutils-gold.
+Author: Alessio Treglia <quadrispro at ubuntu.com>
+Forwarded: no
+---
+ src/makefile |   15 +++++++++------
+ 1 file changed, 9 insertions(+), 6 deletions(-)
+
+--- ladspa-sdk-1.13.orig/src/makefile
++++ ladspa-sdk-1.13/src/makefile
+@@ -90,19 +90,22 @@ targets:	$(PLUGINS) $(PROGRAMS)
+ #
+ 
+ ../bin/applyplugin:	applyplugin.o load.o default.o
+-	$(CC) $(CFLAGS) $(LIBRARIES)					\
++	$(CC) $(CFLAGS)					\
+ 		-o ../bin/applyplugin					\
+-		applyplugin.o load.o default.o
++		applyplugin.o load.o default.o \
++		$(LIBRARIES)
+ 
+ ../bin/analyseplugin:	analyseplugin.o load.o default.o
+-	$(CC) $(CFLAGS) $(LIBRARIES)					\
++	$(CC) $(CFLAGS)					\
+ 		-o ../bin/analyseplugin 				\
+-		analyseplugin.o load.o default.o
++		analyseplugin.o load.o default.o \
++		$(LIBRARIES)
+ 
+ ../bin/listplugins:	listplugins.o search.o
+-	$(CC) $(CFLAGS) $(LIBRARIES)					\
++	$(CC) $(CFLAGS)					\
+ 		-o ../bin/listplugins	 				\
+-		listplugins.o search.o
++		listplugins.o search.o \
++		$(LIBRARIES)
+ 
+ ###############################################################################
+ #
diff --git a/debian/patches/series b/debian/patches/series
index f83e43e..2924f77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_default-ladspa-path.diff
 03_m68k_workaround.diff
 04_fix-linkage-C-plugins.diff
+05_linking_order.diff

-- 
ladspa-sdk packaging



More information about the pkg-multimedia-commits mailing list