Commit 8d880c3e authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent d4a8eebf

package/coreutils/Config.in

+2 −2
Original line number Diff line number Diff line 
config BR2_PACKAGE_COREUTILS

	bool "coreutils"

	depends on BR2_USE_WCHAR && BR2_UCLIBC_PROGRAM_INVOCATION

	depends on BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION

	help

	  All of the basic file/text/shell utilities.  These are the

	  core utilities which are expected to exist on every system.
@@ -14,4 +14,4 @@ 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_UCLIBC_PROGRAM_INVOCATION)
 
	depends on !(BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)

package/tar/Config.in

+2 −2
Original line number Diff line number Diff line 
config BR2_PACKAGE_TAR

	bool "tar"

	depends on BR2_USE_WCHAR && BR2_UCLIBC_PROGRAM_INVOCATION

	depends on BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION

	help

	  A program that saves many files together into a single tape or disk

	  archive, and can restore individual files from the archive.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_TAR 
	  http://www.gnu.org/software/tar/



comment "tar requires a toolchain with WCHAR and PROGRAM_INVOCATION support"

	depends on !(BR2_USE_WCHAR && BR2_UCLIBC_PROGRAM_INVOCATION)
 
	depends on !(BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)

target/generic/Config.in

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ config BR2_TARGET_GENERIC_FIREWALL 


config BR2_TARGET_GENERIC_DEV_SYSTEM

	bool "Generic development system"

	depends on BR2_USE_WCHAR && BR2_UCLIBC_PROGRAM_INVOCATION

	depends on BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION

	select BR2_CCACHE

	select BR2_PACKAGE_GDB

	select BR2_PACKAGE_GDB_SERVER
@@ -59,7 +59,7 @@ config BR2_TARGET_GENERIC_DEV_SYSTEM 
	  Board support for a generic development system.



comment "Generic development system requires a toolchain with WCHAR and PROGRAM_INVOCATION support"

	depends on !(BR2_USE_WCHAR && BR2_UCLIBC_PROGRAM_INVOCATION)

	depends on !(BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION)



menuconfig BR2_TARGET_GENERIC_GETTY

	bool "Generic serial port config"

toolchain/Config.in.2

+10 −0
Original line number Diff line number Diff line
@@ -119,6 +119,16 @@ choice 
		bool "Native POSIX Threading (NPTL)"

endchoice



config BR2_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.

	  If you have an external binary toolchain that has been built

	  with program invocation support then enable this option.



config BR2_GCC_CROSS_CXX

	bool

	help

toolchain/external-toolchain/ext-tool.mk

+3 −1
Original line number Diff line number Diff line
@@ -115,7 +115,8 @@ check_glibc = \ 
	$(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\

	$(call check_glibc_feature,BR2_INET_RPC,RPC support) ;\

	$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\

	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support)

	$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\

	$(call check_glibc_feature,BR2_PROGRAM_INVOCATION,Program invocation support)



#

# Check the conformity of Buildroot configuration with regard to the
@@ -160,6 +161,7 @@ check_uclibc = \ 
	$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\

	$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\

	$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\

	$(call check_uclibc_feature,__UCLIBC_HAS_PROGRAM_INVOCATION_NAME__,BR2_PROGRAM_INVOCATION,$${UCLIBC_CONFIG_FILE},Program invocation support) ;\



#

# Check that the Buildroot configuration of the ABI matches the