From patchwork Thu Oct 31 12:02:39 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas De Schampheleire X-Patchwork-Id: 287465 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 499962C033F for ; Thu, 31 Oct 2013 23:02:55 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 0AF8A32DF3; Thu, 31 Oct 2013 12:02:54 +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 htMFnkTJwXDg; Thu, 31 Oct 2013 12:02:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D62F732DD6; Thu, 31 Oct 2013 12:02:47 +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 1801B1BF988 for ; Thu, 31 Oct 2013 12:02:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 16F3C8C614 for ; Thu, 31 Oct 2013 12:02:47 +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 M-RYuDDSSoc3 for ; Thu, 31 Oct 2013 12:02:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com [74.125.83.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id A93568C664 for ; Thu, 31 Oct 2013 12:02:45 +0000 (UTC) Received: by mail-ee0-f43.google.com with SMTP id b47so1311736eek.30 for ; Thu, 31 Oct 2013 05:02:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:content-transfer-encoding:subject :message-id:user-agent:date:from:to; bh=ahOApXCqIu8D6CUm5XcdL/D+Z4r8tOawObdZ4NRtL9g=; b=Nm3zUtdSGyFT24jpjXupIH8WLPGofNHbrJPA5LCOEj27IXnQfYjvgzK9W/vXhQ/CGx 61au0B9xjMel2+ufyWJND/oSj/B56UoqHrjT8XWExTT/9mq/b4HmH7k9ZUdsJvV6Rbmk qE1/u7wM3yT33InZGdFFPNhFElNXG7Cayo/tfPYWE+MceHq5dn2ErzQbX+qqakzJf6TX TiNit37jsalL+STrhxkICTB1BTuGtWiOG0EP95QJH5LzlvaxG0WlypySf+CU5DSgy2aK zZiu/A4UEYFisrQduHIHHcqQHFtG5LzVGNeVC4+G/1+0gu4MIJ7gY7ESmixciTZ315LV 5gJQ== X-Received: by 10.14.104.5 with SMTP id h5mr2789228eeg.58.1383220964130; Thu, 31 Oct 2013 05:02:44 -0700 (PDT) Received: from [127.0.1.1] (d54C62EEB.access.telenet.be. [84.198.46.235]) by mx.google.com with ESMTPSA id d7sm7725074eem.8.2013.10.31.05.02.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 31 Oct 2013 05:02:43 -0700 (PDT) MIME-Version: 1.0 X-Mercurial-Node: 83487abb960115929a63b85c6bcffb3498bbb037 Message-Id: <83487abb960115929a63.1383220959@argentina> User-Agent: Mercurial-patchbomb/2.2.2 Date: Thu, 31 Oct 2013 13:02:39 +0100 From: Thomas De Schampheleire To: buildroot@busybox.net Subject: [Buildroot] [PATCH] Config.in files: add/update comments on (e)glibc dependencies 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This patch adds missing comments about (e)glibc dependencies and updates the text of existing comments. Additionally, it splits dependency expressions for the touched packages from depends on BR2_BASE_DEP && !BR2_TOOLCHAIN_USES_GLIBC to depends on BR2_BASE_DEP depends on !BR2_TOOLCHAIN_USES_GLIBC so that (positive) base dependencies are separate from the (negative) toolchain dependencies. This strategy makes it easier to write such comments (because one can simply copy the base dependency from the actual package config option), but also avoids complex and long boolean expressions. Signed-off-by: Thomas De Schampheleire --- Note: I'm planning additional patches to line up the other Config.in files with the mentioned split base/toolchain dependency strategy, but since 2013.11 is approaching I'm already sending this in the hope it can still be applied. package/cppcms/Config.in | 2 +- package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 2 +- package/gstreamer/gst-plugin-x170/Config.in | 5 +++-- package/libv4l/Config.in | 4 ++-- package/nss-mdns/Config.in | 4 ++++ package/on2-8170-libs/Config.in | 5 +++-- package/sunxi-cedarx/Config.in | 8 +++++--- package/sunxi-mali/Config.in | 5 +++-- package/ti-gfx/Config.in | 5 +++-- 9 files changed, 25 insertions(+), 15 deletions(-) diff --git a/package/cppcms/Config.in b/package/cppcms/Config.in --- a/package/cppcms/Config.in +++ b/package/cppcms/Config.in @@ -28,5 +28,5 @@ config BR2_PACKAGE_CPPCMS_ICU Using ICU allows advanced localization features into CppCMS, in another hand ICU is heavier than iconv. -comment "cppcms needs a glibc toolchain w/ C++" +comment "cppcms needs an (e)glibc toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in --- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in +++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in @@ -1,4 +1,4 @@ -comment "gpu-viv-bin-mx6q requires a glibc toolchain" +comment "gpu-viv-bin-mx6q needs an (e)glibc toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_GPU_VIV_BIN_MX6Q diff --git a/package/gstreamer/gst-plugin-x170/Config.in b/package/gstreamer/gst-plugin-x170/Config.in --- a/package/gstreamer/gst-plugin-x170/Config.in +++ b/package/gstreamer/gst-plugin-x170/Config.in @@ -11,5 +11,6 @@ config BR2_PACKAGE_GST_PLUGIN_X170 http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer -comment "gst-plugin-x170 requires a toolchain which uses eglibc/glibc" - depends on BR2_PACKAGE_GSTREAMER && BR2_arm926t && !BR2_TOOLCHAIN_USES_GLIBC +comment "gst-plugin-x170 needs an (e)glibc toolchain" + depends on BR2_PACKAGE_GSTREAMER && BR2_arm926t + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_LIBV4L_DECODE_TM6000 help Tool to decode tm6000 proprietary format streams -comment "decode_tm6000 requires a GLIBC based toolchain" +comment "decode_tm6000 needs an (e)glibc toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_LIBV4L_IR_KEYTABLE @@ -26,7 +26,7 @@ config BR2_PACKAGE_LIBV4L_IR_KEYTABLE help Tool to alter keymaps of Remote Controller devices -comment "ir-keytable requires a GLIBC based toolchain" +comment "ir-keytable needs an (e)glibc toolchain" depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE diff --git a/package/nss-mdns/Config.in b/package/nss-mdns/Config.in --- a/package/nss-mdns/Config.in +++ b/package/nss-mdns/Config.in @@ -13,3 +13,7 @@ config BR2_PACKAGE_NSS_MDNS mDNS domain .local. http://0pointer.de/lennart/projects/nss-mdns/ + +comment "nss-mdns needs an (e)glibc toolchain" + depends on BR2_USE_MMU && BR2_PACKAGE_AVAHI_DAEMON + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/on2-8170-libs/Config.in b/package/on2-8170-libs/Config.in --- a/package/on2-8170-libs/Config.in +++ b/package/on2-8170-libs/Config.in @@ -10,5 +10,6 @@ config BR2_PACKAGE_ON2_8170_LIBS http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer -comment "on2-8170 libs requires a linux kernel to be built" - depends on !BR2_LINUX_KERNEL +comment "on2-8170-libs needs an (e)glibc toolchain and a linux kernel to be built" + depends on BR2_arm926t + depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/sunxi-cedarx/Config.in b/package/sunxi-cedarx/Config.in --- a/package/sunxi-cedarx/Config.in +++ b/package/sunxi-cedarx/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_SUNXI_CEDARX bool "sunxi-cedarx" - depends on BR2_TOOLCHAIN_USES_GLIBC && BR2_arm + depends on BR2_arm + depends on BR2_TOOLCHAIN_USES_GLIBC help Sunxi CedarX decoder libraries. CedarX is Allwinner's multimedia co-processing technology for hardware accelerated @@ -10,5 +11,6 @@ config BR2_PACKAGE_SUNXI_CEDARX http://github.com/linux-sunxi/cedarx-libs http://linux-sunxi.org/CedarX -comment "sunxi-cedarx requires an eglibc/glibc based toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC && BR2_arm +comment "sunxi-cedarx needs an (e)glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in --- a/package/sunxi-mali/Config.in +++ b/package/sunxi-mali/Config.in @@ -57,5 +57,6 @@ endchoice endif -comment "sunxi-mali requires an eglibc/glibc based toolchain" - depends on BR2_arm && !BR2_TOOLCHAIN_USES_GLIBC +comment "sunxi-mali needs an (e)glibc toolchain" + depends on BR2_arm + depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/ti-gfx/Config.in b/package/ti-gfx/Config.in --- a/package/ti-gfx/Config.in +++ b/package/ti-gfx/Config.in @@ -60,5 +60,6 @@ endchoice endif -comment "ti-gfx requires an eglibc/glibc based toolchain and the linux kernel" - depends on !(BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC) && BR2_arm +comment "ti-gfx needs an (e)glibc toolchain and the linux kernel" + depends on BR2_arm + depends on !(BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC)