[SCM] libmpc/master: Fix buildsystem to avoid FTBFS with --as-needed

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Jun 17 19:19:33 UTC 2012


The following commit has been merged in the master branch:
commit 5a8eb9edcfcd8e04ffc727d507f2fe3c9221230e
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jun 17 20:53:14 2012 +0200

    Fix buildsystem to avoid FTBFS with --as-needed
    
    Closes: #606829
    Thanks: Stefan Potyra for the patch.

diff --git a/debian/patches/04_link-order.patch b/debian/patches/04_link-order.patch
new file mode 100644
index 0000000..a2e9dba
--- /dev/null
+++ b/debian/patches/04_link-order.patch
@@ -0,0 +1,44 @@
+---
+ mpc2sv8/Makefile.am |    5 +++--
+ mpcdec/Makefile.am  |    5 +++--
+ mpcenc/Makefile.am  |    5 +++--
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+--- libmpc.orig/mpc2sv8/Makefile.am
++++ libmpc/mpc2sv8/Makefile.am
+@@ -11,6 +11,7 @@ common_sources = ../common/crc32.c
+ METASOURCES = AUTO
+ bin_PROGRAMS = mpc2sv8
+ mpc2sv8_SOURCES = mpc2sv8.c $(common_sources)
+-mpc2sv8_LDADD = -lm \
++mpc2sv8_LDADD = \
+ 	$(top_builddir)/libmpcdec/libmpcdec.la \
+-	$(top_builddir)/libmpcenc/libmpcenc.a
++	$(top_builddir)/libmpcenc/libmpcenc.a \
++	-lm
+--- libmpc.orig/mpcdec/Makefile.am
++++ libmpc/mpcdec/Makefile.am
+@@ -9,6 +9,7 @@ endif
+ METASOURCES = AUTO
+ bin_PROGRAMS = mpcdec
+ mpcdec_SOURCES = mpcdec.c
+-mpcdec_LDADD = -lm \
++mpcdec_LDADD = \
+ 	$(top_builddir)/libmpcdec/libmpcdec.la \
+-	$(top_builddir)/libwavformat/libwavformat.a
++	$(top_builddir)/libwavformat/libwavformat.a \
++	-lm
+--- libmpc.orig/mpcenc/Makefile.am
++++ libmpc/mpcenc/Makefile.am
+@@ -22,8 +22,9 @@ mpcenc_SOURCES = keyboard.c mpcenc.c pip
+ 	$(common_sources) \
+ 	mpcenc.h predict.h config.h
+ 
+-mpcenc_LDADD = -lm \
++mpcenc_LDADD = \
+ 	$(EXTRALIBS) \
+ 	$(top_builddir)/libmpcpsy/libmpcpsy.a \
+-	$(top_builddir)/libmpcenc/libmpcenc.a
++	$(top_builddir)/libmpcenc/libmpcenc.a \
++	-lm
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 04bcfb1..2ef2565 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_link-libm.patch
 03_mpcchap.patch
 99_autoreconf.patch
+04_link-order.patch

-- 
libmpc packaging



More information about the pkg-multimedia-commits mailing list