From patchwork Tue May 24 17:59:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Korsgaard X-Patchwork-Id: 625859 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rDjpY74vkz9t4g for ; Wed, 25 May 2016 03:59:17 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=XOZ3I0wW; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B1E0A916F9; Tue, 24 May 2016 17:59:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y2A3e2NypUZa; Tue, 24 May 2016 17:59:13 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 15DD990EA4; Tue, 24 May 2016 17:59:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E429B1C1730 for ; Tue, 24 May 2016 17:59:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DFC718D2EC for ; Tue, 24 May 2016 17:59:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2bm7YNQLVYhn for ; Tue, 24 May 2016 17:59:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id B6EFB8D4E9 for ; Tue, 24 May 2016 17:59:10 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id f75so8407673wmf.2 for ; Tue, 24 May 2016 10:59:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=X3uc8OsGjDkoHBwZF2DOstzf609uRxo5vhq3GR7ZQh4=; b=XOZ3I0wWn5M6V5M0SBqt5aXGwxC+RVr3isk59WV2vQHzXCWdBWRvy+zZmtctSM89WE UlWW37mZHnw9o0BIfmNN1y0Kd4VvUetFgYp8AB4mZ6RJsStHXn4JMhqbjf2AB/pIXNMS SWVRMedBTZ2WT1a4kM20TFnV/4lefHWzP/l/rU+xqOtMlSGsDHj2XUewsuAQ1fY7Efl7 vCR7qN2NXZFeYtYq6T6aEs60eFY8doxntIR14hkis31WEfCNelddVoiKts8KLNy10GZb lHL1gulUQE8jcxzQoE7Qv3i0aXcNtnU14chePPehwQ0ha7ynfS2MkyU70Fy3RAn4mCfG RXGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=X3uc8OsGjDkoHBwZF2DOstzf609uRxo5vhq3GR7ZQh4=; b=TA/KTIxVBziYLX3LRLIBcSOByKQNNHA46wiEaSfPVkZt6Iqvf8icKzzVQC6W9PJZz2 wnl6r9MDFTJHTZ76rBor8Cd0S0aZQOXyeti2BWZptApwgmcD4ojn+2xq51t44E5VCs+M QhflPkAkeQbA+ytkeg6Sccd7mf/H6GDjzoF9wvyVMSW9Tm2CNENlzMEXUIPjA7P5DVZZ kKLFvDg9BBM/KUQCiyqn3eNGxwyYQD4FUDZmbx5tXoe1VOuhylskvDr4gCDGPt/TmxCZ Zx+sYxTnQDijSVUjntkDLUeDv7inY8xGCXcFfzxv+vYWFnEnttiJuSASYYlJkbojIL8R X+dw== X-Gm-Message-State: ALyK8tJPMM6ii9T0XPMyR73rPKMG0KUCY17DLA5QLoZxVf4zrP7wslr7yLYSniEqpIKapg== X-Received: by 10.194.23.1 with SMTP id i1mr5661895wjf.142.1464112749133; Tue, 24 May 2016 10:59:09 -0700 (PDT) Received: from dell.be.48ers.dk ([2001:6f8:1434:0:6267:20ff:fe4e:21b6]) by smtp.gmail.com with ESMTPSA id he10sm4431231wjc.21.2016.05.24.10.59.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 May 2016 10:59:08 -0700 (PDT) Received: from peko by dell.be.48ers.dk with local (Exim 4.84) (envelope-from ) id 1b5Gbj-0001AT-5S; Tue, 24 May 2016 19:59:07 +0200 From: Peter Korsgaard To: buildroot@buildroot.org Date: Tue, 24 May 2016 19:59:05 +0200 Message-Id: <1464112745-4450-1-git-send-email-peter@korsgaard.com> X-Mailer: git-send-email 2.7.0 Subject: [Buildroot] [PATCH] mpg123: unbreak static linking with alsa/portaudio X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- .../0001-Makefile.am-don-t-override-LIBS.patch | 46 ++++++++++++++++++++++ package/mpg123/mpg123.mk | 2 + 2 files changed, 48 insertions(+) create mode 100644 package/mpg123/0001-Makefile.am-don-t-override-LIBS.patch 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 0000000..a5bfe80 --- /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 +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 +--- + 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 00bb971..19a0de1 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)