From patchwork Sat Apr 22 20:10:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 753835 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w9NzL0ylkz9ryb for ; Sun, 23 Apr 2017 06:11:25 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6311A304CB; Sat, 22 Apr 2017 20:11:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jppTa8AoSPrD; Sat, 22 Apr 2017 20:11:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AFB6F304C1; Sat, 22 Apr 2017 20:11:18 +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 BF85F1BFF0F for ; Sat, 22 Apr 2017 20:11:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id BB3A38A0CE for ; Sat, 22 Apr 2017 20:11:16 +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 LMjlauVPidnr for ; Sat, 22 Apr 2017 20:11:15 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id C02988A094 for ; Sat, 22 Apr 2017 20:11:14 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 9ACAF440780; Sat, 22 Apr 2017 23:10:51 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Sat, 22 Apr 2017 23:10:44 +0300 Message-Id: <0a5dac7516bd86eca86510a190385617af60d738.1492891844.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.11.0 Cc: Steve Kenton , Thomas Schmitt Subject: [Buildroot] [PATCH] xorriso: disable libcdio 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" xorriso and libcdio define identically named symbols. This breaks static linking. Besides, upstream suggested that on Linux the built-in libburn adapter is much better tested than libcdio. Disable libcdio. Fixes: http://autobuild.buildroot.net/results/430/430a6b548fcc311f20ea71cecaa11fafac1d5a19/ http://autobuild.buildroot.net/results/a5d/a5d0f8bec0d39e48f6dfe4ecc07fe0ca3c6bd70a/ Cc: Steve Kenton Suggested-by: Thomas Schmitt Signed-off-by: Baruch Siach Acked-by: Steve Kenton --- package/xorriso/xorriso.mk | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/package/xorriso/xorriso.mk b/package/xorriso/xorriso.mk index b2055804302e..1f095911f80f 100644 --- a/package/xorriso/xorriso.mk +++ b/package/xorriso/xorriso.mk @@ -18,19 +18,14 @@ HOST_XORRISO_CONF_OPTS = \ --disable-libedit \ --disable-libacl +# libcdio doesn't make sense for Linux +# http://lists.gnu.org/archive/html/bug-xorriso/2017-04/msg00004.html +XORRISO_CONF_OPTS = --disable-libcdio + ifeq ($(BR2_PACKAGE_LIBICONV),y) XORRISO_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_LIBCDIO),y) -XORRISO_DEPENDENCIES += host-pkgconf libcdio -XORRISO_CONF_OPTS += \ - --enable-pkg-check-modules \ - --enable-libcdio -else -XORRISO_CONF_OPTS += --disable-libcdio -endif - ifeq ($(BR2_PACKAGE_READLINE),y) XORRISO_DEPENDENCIES += readline XORRISO_CONF_OPTS += --enable-libreadline