aboutsummaryrefslogtreecommitdiff
path: root/package/mpg123
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2016-05-24 19:59:05 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2016-05-25 07:44:46 +0200
commitf9419d752de00a06acf1d02ad2bc18c023e851bf (patch)
tree750da86805afe897a1cbb142cba67902f8b4c7ed /package/mpg123
parentce46860c94fc36e6f24f14ddbd4617f3c25718f9 (diff)
downloadbuildroot-f9419d752de00a06acf1d02ad2bc18c023e851bf.tar.gz
buildroot-f9419d752de00a06acf1d02ad2bc18c023e851bf.tar.bz2
mpg123: unbreak static linking with alsa/portaudio
Fixes: http://autobuild.buildroot.org/results/b2b/b2bc143fbd0b34e75a44af41ab6899dd9fa3c21a/ http://autobuild.buildroot.org/results/60d/60d56b0a75d209f2cfeff0727c2f900abc89d263/ http://autobuild.buildroot.org/results/6a8/6a8729ce69055821fdf0b91adcea2ea201d40189/ And many more. A recent upstream build system change caused LIBS to be ignored at build time (but still used a configure time), causing our static linking workarounds to no longer work. Fix it by adding a patch to cause it to no longer ignore LIBS. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/mpg123')
-rw-r--r--package/mpg123/0001-Makefile.am-don-t-override-LIBS.patch46
-rw-r--r--package/mpg123/mpg123.mk2
2 files changed, 48 insertions, 0 deletions
diff --git a/package/mpg123/0001-Makefile.am-don-t-override-LIBS.patch b/package/mpg123/0001-Makefile.am-don-t-override-LIBS.patch
new file mode 100644
index 0000000000..a5bfe80094
--- /dev/null
+++ b/package/mpg123/0001-Makefile.am-don-t-override-LIBS.patch
@@ -0,0 +1,46 @@
+From 25c2e71c9ce762561eeacd35bf432c6692c0fb44 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <peter@korsgaard.com>
+Date: Tue, 24 May 2016 17:34:32 +0200
+Subject: [PATCH] Makefile.am: don't override LIBS
+
+Patch status: posted upstream
+https://sourceforge.net/p/mpg123/mailman/message/35111696/
+
+The recent build system change broke custom LIBS handling. As opposed to the
+other internal variables, LIBS can be provided by the user when running
+configure, E.G.:
+
+LIBS="-lfoo -lbar" ./configure ..
+
+This is correctly used by the configure checks, but doesn't end up in the
+Makefile any more because of this override - Breaking static builds where
+the configure script needs a bit of help to link with -lpthread when
+alsa/portaudio is used (as those use pthreads internally).
+
+Fixes the following build issues from the Buildroot autobuilders:
+
+http://autobuild.buildroot.net/?reason=mpg123-1.23.3
+
+(see https://git.buildroot.net/buildroot/tree/package/mpg123/mpg123.mk for
+the build logic)
+
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
+---
+ Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index d695a3b..863f59f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -9,7 +9,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+ bin_PROGRAMS =
+ EXTRA_PROGRAMS =
+-LIBS =
+ EXTRA_DIST =
+ pkglib_LTLIBRARIES =
+ lib_LTLIBRARIES =
+--
+2.7.0
+
diff --git a/package/mpg123/mpg123.mk b/package/mpg123/mpg123.mk
index 00bb971fdb..19a0de11e9 100644
--- a/package/mpg123/mpg123.mk
+++ b/package/mpg123/mpg123.mk
@@ -12,6 +12,8 @@ MPG123_INSTALL_STAGING = YES
MPG123_LICENSE = LGPLv2.1
MPG123_LICENSE_FILES = COPYING
MPG123_DEPENDENCIES = host-pkgconf
+# 0001-Makefile.am-don-t-override-LIBS.patch patches Makefile.am
+MPG123_AUTORECONF = YES
MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu)