From 8d880c3e5c68bea752c2a075d0ef0c64805df93f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 31 Jul 2009 11:40:34 +0200 Subject: Fix PROGRAM_INVOCATION handling with external toolchains BR2_UCLIBC_PROGRAM_INVOCATION is a toolchain configuration option, like BR2_INET_IPV6, BR2_INET_RPC, on which some packages depend. Therefore, it should be handled like BR2_INET_IPV6 and BR2_INET_RPC in order to work properly with external toolchains. Since we move it out of toolchain/uClibc/Config.in into toolchain/Config.in.2, we rename the option to BR2_PROGRAM_INVOCATION (since BR2_INET_RPC and others don't have UCLIBC in their name). Signed-off-by: Thomas Petazzoni --- toolchain/uClibc/Config.in | 8 -------- toolchain/uClibc/uclibc.mk | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'toolchain/uClibc') diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index b7678a356..d0486abd6 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -68,14 +68,6 @@ config BR2_PTHREAD_DEBUG help Build the thread library with debugging enabled. -config BR2_UCLIBC_PROGRAM_INVOCATION - bool "Enable 'program invocation name'" - help - Support for the GNU-specific program_invocation_name and - program_invocation_short_name strings. Some GNU packages - (like tar and coreutils) utilize these for extra useful - output, but in general are not required. - config BR2_UCLIBC_INSTALL_TEST_SUITE bool "Compile and install uClibc tests" select BR2_PACKAGE_MAKE diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 80d7d9861..de8e1d562 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -353,7 +353,7 @@ ifeq ($(BR2_USE_WCHAR),y) else $(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=n,g' $(UCLIBC_DIR)/.oldconfig endif -ifeq ($(BR2_UCLIBC_PROGRAM_INVOCATION),y) +ifeq ($(BR2_PROGRAM_INVOCATION),y) $(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y,g' $(UCLIBC_DIR)/.oldconfig else $(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=n,g' $(UCLIBC_DIR)/.oldconfig -- cgit v1.2.3