From patchwork Sun Aug 17 19:29:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 380624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 107A1140110 for ; Mon, 18 Aug 2014 05:30:23 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3F5068AE26; Sun, 17 Aug 2014 19:30: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 ooTniEeaL6XK; Sun, 17 Aug 2014 19:30:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id A35C28AA28; Sun, 17 Aug 2014 19:30:14 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 19DE21BFA1D for ; Sun, 17 Aug 2014 19:30:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 16D268AA27 for ; Sun, 17 Aug 2014 19:30:12 +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 PfVlVdG4J8B2 for ; Sun, 17 Aug 2014 19:30:09 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com [74.125.82.41]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3432589D8C for ; Sun, 17 Aug 2014 19:30:09 +0000 (UTC) Received: by mail-wg0-f41.google.com with SMTP id z12so4078386wgg.0 for ; Sun, 17 Aug 2014 12:30:07 -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:in-reply-to:references; bh=lvFbnP9BhjuyoHLQwkfNuJrI7wn1EXZxyQpoSfUW1Mo=; b=trndG0LdxTAwjNLrofTe5eJlCa3dYegspkYU7OynRdRKBU2z37FJahfJm0kAWlr6A7 rggXYZR5dsYne9nc3a8jS91YqZ0HkrWn7ayv38IwMSgijC60Up/8Q213NgqAakb9ZYKN hzKQqexeSrswA6mb8pQ4CeinihCCDAYUflDQtUV3A7XGCoxWNLdaaRdTX+L0VV3N4W8A ig6b4UIhU0gEv4lnSxW6jqZlH+02+5Bb5+IPDrW4dXzHMB3+lZUNWJ0yqg5g5ZArmGvN eTM05X0JzJaBjrrokJ8eddzo0uyU/TwkO3iZ0iXVAaBLBM8lPj3ED0uJ9UDzMI7eUF2g TWdg== X-Received: by 10.194.19.200 with SMTP id h8mr35443840wje.40.1408303807699; Sun, 17 Aug 2014 12:30:07 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id ez1sm30072010wib.15.2014.08.17.12.30.06 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 17 Aug 2014 12:30:06 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 17 Aug 2014 21:29:41 +0200 Message-Id: <1e0bc86502b189a9c2a84cde0393ce646ac8a36d.1408303753.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 02/24 v5] package/icu: use the new ARCH_HAS_ATOMICS as dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net And propagate to the reverse dependencies of icu. Also, fix beecrypt's comment: only the C++ support needs atomics. Signed-off-by: "Yann E. MORIN" Cc: Anton Kolesov Cc: Thomas Petazzoni --- package/beecrypt/Config.in | 12 ++++++------ package/cppcms/Config.in | 7 ++++--- package/icu/Config.in | 7 ++++--- package/php/Config.ext | 8 ++++---- package/qt5/qt5base/Config.in | 5 +---- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/package/beecrypt/Config.in b/package/beecrypt/Config.in index e0f9181..b9685ef 100644 --- a/package/beecrypt/Config.in +++ b/package/beecrypt/Config.in @@ -1,5 +1,5 @@ -comment "beecrypt needs a toolchain w/ threads, atomic intrinsics" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS +comment "beecrypt needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_BEECRYPT bool "beecrypt" @@ -15,15 +15,15 @@ config BR2_PACKAGE_BEECRYPT_CPP bool "C++ support" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # icu - depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # icu depends on !BR2_BINFMT_FLAT # icu + depends on BR2_ARCH_HAS_ATOMICS # icu select BR2_PACKAGE_ICU help Enable C++ support. This pulls in the (large) icu package. -comment "C++ support needs a toolchain w/ wchar, atomic intrinsics" +comment "C++ support needs a toolchain w/ wchar" depends on !BR2_BINFMT_FLAT - depends on BR2_INSTALL_LIBSTDCPP && (!BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS) + depends on BR2_ARCH_HAS_ATOMICS + depends on BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR endif # BR2_PACKAGE_BEECRYPT diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in index 297c514..dbe4786 100644 --- a/package/cppcms/Config.in +++ b/package/cppcms/Config.in @@ -26,14 +26,15 @@ config BR2_PACKAGE_CPPCMS_ICU bool "enable icu support" depends on !BR2_BINFMT_FLAT # icu depends on BR2_USE_WCHAR # icu - depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # icu + depends on BR2_ARCH_HAS_ATOMICS # icu select BR2_PACKAGE_ICU help Using ICU allows advanced localization features into CppCMS, in another hand ICU is heavier than iconv. -comment "icu support needs a toolchain w/ wchar, atomic intrinsics" - depends on !BR2_BINFMT_FLAT || !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS +comment "icu support needs a toolchain w/ wchar" + depends on !BR2_BINFMT_FLAT + depends on BR2_ARCH_HAS_ATOMICS depends on !BR2_USE_WCHAR endif diff --git a/package/icu/Config.in b/package/icu/Config.in index d4521ac..d7bf2fe 100644 --- a/package/icu/Config.in +++ b/package/icu/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_ICU # file, and it cannot easily be changed to generate FLAT # format. depends on !BR2_BINFMT_FLAT - depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS + depends on BR2_ARCH_HAS_ATOMICS help International Components for Unicode. @@ -25,7 +25,8 @@ config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH endif -comment "icu needs a toolchain w/ C++, wchar, threads, atomic intrinsics" +comment "icu needs a toolchain w/ C++, wchar, threads" depends on !BR2_BINFMT_FLAT + depends on BR2_ARCH_HAS_ATOMICS depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/php/Config.ext b/package/php/Config.ext index 078be8d..e07779a 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -168,14 +168,14 @@ config BR2_PACKAGE_PHP_EXT_INTL depends on BR2_USE_WCHAR depends on !BR2_BINFMT_FLAT # icu depends on BR2_TOOLCHAIN_HAS_THREADS # icu - depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # icu + depends on BR2_ARCH_HAS_ATOMICS # icu help Internationalization support -comment "intl support needs a toolchain w/ C++, wchar, threads, atomic intrinsics" +comment "intl support needs a toolchain w/ C++, wchar, threads" depends on !BR2_BINFMT_FLAT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS + depends on BR2_ARCH_HAS_ATOMICS + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS comment "Image processing" diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index 67f211c..7a34d6f 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -241,15 +241,12 @@ config BR2_PACKAGE_QT5BASE_DBUS config BR2_PACKAGE_QT5BASE_ICU bool "Enable ICU support" select BR2_PACKAGE_ICU - depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # icu + depends on BR2_ARCH_HAS_ATOMICS # icu depends on !BR2_BINFMT_FLAT # icu help This option enables ICU support in Qt5. This is for example needed for Qt5Webkit. -comment "icu needs a toolchain w/ atomic intrinsics" - depends on !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS - config BR2_PACKAGE_QT5BASE_TSLIB bool "Enable Tslib support" depends on !BR2_PREFER_STATIC_LIB # dlopen