[SCM] phasex/master: Correct linking order to fix the build failure with the newest toolchain; thanks to Michael Bienia for the patch (LP: #677501).

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Feb 10 11:39:44 UTC 2011


The following commit has been merged in the master branch:
commit aaaa28841d7be7e7403cf59bb5a8516e3ed4d0a5
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Feb 10 12:38:48 2011 +0100

    Correct linking order to fix the build failure with the newest toolchain; thanks to Michael Bienia for the patch (LP: #677501).

diff --git a/debian/patches/03-binutils_gold.patch b/debian/patches/03-binutils_gold.patch
new file mode 100644
index 0000000..2629112
--- /dev/null
+++ b/debian/patches/03-binutils_gold.patch
@@ -0,0 +1,19 @@
+From: https://bugs.launchpad.net/ubuntu/+source/phasex/+bug/677501/comments/1
+Description: Correct linking order to fix FTBFS with binutils-gold.
+Bug-Ubuntu: https://launchpad.net/bugs/677501
+Forwarded: yes
+---
+ src/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- phasex-0.12.0+m1.orig/src/Makefile.am
++++ phasex-0.12.0+m1/src/Makefile.am
+@@ -23,7 +23,7 @@ phasex_SOURCES = \
+ 
+ AM_CFLAGS   = @PHASEX_CFLAGS@
+ AM_CPPFLAGS = $(EXTRA_CPPFLAGS) @PHASEX_CPPFLAGS@
+-AM_LDFLAGS  = $(INTLLIBS) @PHASEX_LIBS@
++LIBS  = $(INTLLIBS) @PHASEX_LIBS@ -lX11
+ 
+ distclean-local:
+ 	rm -f *~
diff --git a/debian/patches/series b/debian/patches/series
index 91c1ce0..958d3bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01-desktop_file.patch
 02-gcc_flags.patch
+03-binutils_gold.patch

-- 
phasex packaging



More information about the pkg-multimedia-commits mailing list