From patchwork Tue Oct 20 20:51:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 533169 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]) by ozlabs.org (Postfix) with ESMTP id 49BA214110B for ; Wed, 21 Oct 2015 07:52:28 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=embedded.rocks header.i=@embedded.rocks header.b=Xk0J97sE; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7C4278CA79; Tue, 20 Oct 2015 20:52:27 +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 9bwpOMABLWNb; Tue, 20 Oct 2015 20:52:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 5333E8C831; Tue, 20 Oct 2015 20:52:23 +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 35BCF1C0DBE for ; Tue, 20 Oct 2015 20:52:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 30CBE8A4CD for ; Tue, 20 Oct 2015 20:52:22 +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 3GYJFG75sk2C for ; Tue, 20 Oct 2015 20:52:20 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mout01.posteo.de (mout01.posteo.de [185.67.36.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 62A8D8C831 for ; Tue, 20 Oct 2015 20:52:20 +0000 (UTC) Received: from dovecot03.posteo.de (dovecot03.posteo.de [172.16.0.13]) by mout01.posteo.de (Postfix) with ESMTPS id BA12A209FA for ; Tue, 20 Oct 2015 22:52:17 +0200 (CEST) Received: from mail.posteo.de (localhost [127.0.0.1]) by dovecot03.posteo.de (Postfix) with ESMTPSA id 3ngRwK1DHSz5vN8; Tue, 20 Oct 2015 22:52:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail.embedded.rocks (Postfix) with ESMTP id E2F77EE0C59; Tue, 20 Oct 2015 22:52:15 +0200 (CEST) Authentication-Results: mail.embedded.rocks (amavisd-new); dkim=pass reason="pass (just generated, assumed good)" header.d=embedded.rocks DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embedded.rocks; h=content-transfer-encoding:content-type:content-type :mime-version:x-mailer:message-id:date:date:subject:subject:from :from:received:received; s=default; t=1445374322; x=1445979123; bh=xHqZqtSUOUh/4j829sVZN1HN+I8mcQx3Gd1R4geiPLE=; b=Xk0J97sEIc8d 6SxssqNpq5QOi8WlVN5/3znWdIZeSqTkXIuFurbD2g2ry2Suqm3OyUs0+bh8ZvTu mO5wZ2i09Ql2DckjPgoL8x42h/Kme2rnew52btsG6wAbf64UUMOpAQnrbzXFv7Ud USVxHVGzi1yeV8oxicI58UzLl1Fy3Zbeq0wr8YbqJqY6vYucAD3uZ3O61vP6hJUC oj3xaMHxU1HnsBLKtP79TKaTwGlMNAOp1EsiETuAxZo/HVJ56FnZzJ407QcoTH4W tA2hWnyy4xIU43picW3t15M11aDdcpXkwOtEAajJS6vuwOwcKR+xeE195vTalCIF mqhzAYcWbg== X-Virus-Scanned: Debian amavisd-new at mail.embedded.rocks Received: from mail.embedded.rocks ([127.0.0.1]) by localhost (mail.embedded.rocks [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id CsXwwVz84tfB; Tue, 20 Oct 2015 22:52:02 +0200 (CEST) Received: from nzxt.fritz.box (xd9bff721.dyn.telefonica.de [217.191.247.33]) (Authenticated sender: joerg.krause@embedded.rocks) by mail.embedded.rocks (Postfix) with ESMTPSA; Tue, 20 Oct 2015 22:52:02 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Tue, 20 Oct 2015 22:51:53 +0200 Message-Id: <1445374313-30804-1-git-send-email-joerg.krause@embedded.rocks> X-Mailer: git-send-email 2.6.1 MIME-Version: 1.0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 1/1] package/jsoncpp: broken with musl on x86 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch replaces a previous submission made by Bernd Kuhls some while ago [1]. The posix_memalign declaration is incompatible with musl for C++, because of the exception specification [2]. Note, the referenced patch is part of the a patch series to "Add musl support to GCC". Instead of patching gcc in Buildroot we disable jsoncpp and any reverse dependendy with the musl toolchain on x86. [1] https://patchwork.ozlabs.org/patch/505425/ [2] https://gcc.gnu.org/ml/gcc-patches/2015-04/msg01084.html Fixes: http://autobuild.buildroot.net/results/588/5885d33b8d9f17878f565f3ae5371017dc89aede/ http://autobuild.buildroot.net/results/0d9/0d90c7c13ae1640b07709c4c686e0237ada1324d/ http://autobuild.buildroot.net/results/30b/30b98ac7362c27254218a6e521d29971070f8c3c/ http://autobuild.buildroot.net/results/292/29289c125166630aeaf884ccc006bcf12c8aa0f6/ and many more. Signed-off-by: Jörg Krause --- package/cmake/Config.in | 4 ++++ package/jsoncpp/Config.in | 5 +++++ package/kodi-pvr-argustv/Config.in | 4 ++++ package/kodi-pvr-filmon/Config.in | 4 ++++ package/kodi-pvr-pctv/Config.in | 4 ++++ package/kodi-pvr-stalker/Config.in | 4 ++++ package/sysdig/Config.in | 4 ++++ 7 files changed, 29 insertions(+) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 6f04a4a..4ba844a 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -20,6 +20,7 @@ config BR2_PACKAGE_CMAKE_CTEST select BR2_PACKAGE_EXPAT select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_XZ + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) # jsoncpp depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp depends on BR2_USE_WCHAR # libarchive @@ -38,3 +39,6 @@ comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +comment "ctest needs a (e)glibc or uClibc toolchain w/ C++ on x86" + depends on (BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) diff --git a/package/jsoncpp/Config.in b/package/jsoncpp/Config.in index 83118c4..a29e569 100644 --- a/package/jsoncpp/Config.in +++ b/package/jsoncpp/Config.in @@ -1,4 +1,6 @@ config BR2_PACKAGE_JSONCPP + # posix_memalign is incompatible with musl for C++ on x86 + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 depends on BR2_INSTALL_LIBSTDCPP bool "jsoncpp" @@ -13,3 +15,6 @@ config BR2_PACKAGE_JSONCPP comment "jsoncpp needs a toolchain w/ C++, gcc >= 4.7" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +comment "jsoncpp needs a (e)glibc or uClibc toolchain w/ C++ on x86" + depends on (BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) diff --git a/package/kodi-pvr-argustv/Config.in b/package/kodi-pvr-argustv/Config.in index 247d83c..c9b74e0 100644 --- a/package/kodi-pvr-argustv/Config.in +++ b/package/kodi-pvr-argustv/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_PVR_ARGUSTV bool "kodi-pvr-argustv" + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) # jsoncpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM @@ -10,3 +11,6 @@ config BR2_PACKAGE_KODI_PVR_ARGUSTV comment "kodi-pvr-argustv needs a toolchain w/ gcc >= 4.7" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +comment "kodi-pvr-argustv needs a (e)glibc or uClibc toolchain w/ C++ on x86" + depends on (BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) diff --git a/package/kodi-pvr-filmon/Config.in b/package/kodi-pvr-filmon/Config.in index 3d87ec8..a6e2a7d 100644 --- a/package/kodi-pvr-filmon/Config.in +++ b/package/kodi-pvr-filmon/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_PVR_FILMON bool "kodi-pvr-filmon" + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) # jsoncpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM @@ -10,3 +11,6 @@ config BR2_PACKAGE_KODI_PVR_FILMON comment "kodi-pvr-filmon needs a toolchain w/ gcc >= 4.7" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +comment "kodi-pvr-filmon needs a (e)glibc or uClibc toolchain w/ C++ on x86" + depends on (BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) diff --git a/package/kodi-pvr-pctv/Config.in b/package/kodi-pvr-pctv/Config.in index 1bef551..bd32349 100644 --- a/package/kodi-pvr-pctv/Config.in +++ b/package/kodi-pvr-pctv/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_PVR_PCTV bool "kodi-pvr-pctv" + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) # jsoncpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM @@ -10,3 +11,6 @@ config BR2_PACKAGE_KODI_PVR_PCTV comment "kodi-pvr-pctv needs a toolchain w/ gcc >= 4.7" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +comment "kodi-pvr-pctv needs a (e)glibc or uClibc toolchain w/ C++ on x86" + depends on (BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) diff --git a/package/kodi-pvr-stalker/Config.in b/package/kodi-pvr-stalker/Config.in index 26a8c3f..1d570cd 100644 --- a/package/kodi-pvr-stalker/Config.in +++ b/package/kodi-pvr-stalker/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_KODI_PVR_STALKER bool "kodi-pvr-stalker" + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) # jsoncpp depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_KODI_PLATFORM @@ -10,3 +11,6 @@ config BR2_PACKAGE_KODI_PVR_STALKER comment "kodi-pvr-stalker needs a toolchain w/ gcc >= 4.7" depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + +comment "kodi-pvr-stalker needs a (e)glibc or uClibc toolchain w/ C++ on x86" + depends on (BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) diff --git a/package/sysdig/Config.in b/package/sysdig/Config.in index dc71d5f..c1908b5 100644 --- a/package/sysdig/Config.in +++ b/package/sysdig/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_SYSDIG select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LUAJIT select BR2_PACKAGE_JSONCPP + depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64)) # jsoncpp depends on BR2_LINUX_KERNEL depends on BR2_INSTALL_LIBSTDCPP # libjson depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS @@ -19,3 +20,6 @@ config BR2_PACKAGE_SYSDIG comment "sysdig needs a toolchain w/ C++, dynamic library and a Linux kernel to be built" depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS + +comment "sysdig needs a (e)glibc or uClibc toolchain w/ C++ on x86" + depends on (BR2_TOOLCHAIN_USES_MUSL && (BR2_i386 || BR2_x86_64))