From 4ee9d569f9ae5da199b6e64a45d83dc6aa9c78ce Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 27 Jul 2011 11:51:47 +0200 Subject: uClibc: drop BR2_PROGRAM_INVOCATION option Remove the BR option and enable the configuration setting in the uClibc defconfigs. The BR2_PROGRAM_INVOCATION option only adds very little overhead to uClibc, and we have a number of packages needing it, so simply always enable it - Simplifying the kconfig logic and the number of choices users have to make. Signed-off-by: Peter Korsgaard --- package/coreutils/Config.in | 6 +++--- package/tar/Config.in | 6 +++--- package/udev/Config.in | 5 ++--- package/usbutils/Config.in | 4 ---- package/util-linux/Config.in | 5 ++--- 5 files changed, 10 insertions(+), 16 deletions(-) (limited to 'package') diff --git a/package/coreutils/Config.in b/package/coreutils/Config.in index a7159cf9e..bfd6f2620 100644 --- a/package/coreutils/Config.in +++ b/package/coreutils/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_COREUTILS bool "coreutils" - depends on BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION + depends on BR2_USE_WCHAR help All of the basic file/text/shell utilities. These are the core utilities which are expected to exist on every system. @@ -13,5 +13,5 @@ config BR2_PACKAGE_COREUTILS http://www.gnu.org/software/coreutils/ -comment "coreutils requires a toolchain with WCHAR and PROGRAM_INVOCATION support" - depends on !(BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION) +comment "coreutils requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/tar/Config.in b/package/tar/Config.in index 20529e378..427cae461 100644 --- a/package/tar/Config.in +++ b/package/tar/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_TAR bool "tar" - depends on BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION + depends on BR2_USE_WCHAR help A program that saves many files together into a single tape or disk archive, and can restore individual files from the archive. http://www.gnu.org/software/tar/ -comment "tar requires a toolchain with WCHAR and PROGRAM_INVOCATION support" - depends on !(BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION) +comment "tar requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/udev/Config.in b/package/udev/Config.in index 48391e5fb..67fd413d9 100644 --- a/package/udev/Config.in +++ b/package/udev/Config.in @@ -11,7 +11,6 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS bool "enable all extras" depends on BR2_LARGEFILE # acl depends on BR2_USE_WCHAR # libglib2 - depends on BR2_PROGRAM_INVOCATION # usbutils select BR2_PACKAGE_ACL select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT @@ -22,7 +21,7 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS Enable all extras with external dependencies like libacl, libusb, libusb-compat, usbutils, hwdata -comment "udev extras requires a toolchain with LARGEFILE/WCHAR/PROGRAM_INVOCATION support" - depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION) +comment "udev extras requires a toolchain with LARGEFILE + WCHAR support" + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) endif diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in index fbd712b86..23004d952 100644 --- a/package/usbutils/Config.in +++ b/package/usbutils/Config.in @@ -1,9 +1,5 @@ -comment "usbutils requires a toolchain with PROGRAM_INVOCATION support" - depends on !BR2_PROGRAM_INVOCATION - config BR2_PACKAGE_USBUTILS bool "usbutils" - depends on BR2_PROGRAM_INVOCATION select BR2_PACKAGE_LIBUSB help USB enumeration utilities diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index b59a31ab2..c0e15e715 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_UTIL_LINUX bool "util-linux" depends on BR2_LARGEFILE depends on BR2_USE_WCHAR - depends on BR2_PROGRAM_INVOCATION help Various useful/essential Linux utilities. @@ -119,5 +118,5 @@ config BR2_PACKAGE_UTIL_LINUX_WRITE endif -comment "util-linux requires a toolchain with LARGEFILE/WCHAR/PROGRAM_INVOCATION support" - depends on !(BR2_LARGEFILE && BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION) +comment "util-linux requires a toolchain with LARGEFILE + WCHAR support" + depends on !(BR2_LARGEFILE && BR2_USE_WCHAR) -- cgit v1.2.3