From 381616e77ae7610f8fe07b9e0eb193d613fb3bf7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 30 Jun 2013 21:29:09 +0200 Subject: Introduce BR2_TOOLCHAIN_USES_{UCLIBC, GLIBC} Currently, when we need to do a conditional on the type of C library used, we need to take into account the three toolchain backends. As we are going to add eglibc support to the Buildroot toolchain backend, it would become even uglier, so this patch introduces two new hidden options: BR2_TOOLCHAIN_USES_UCLIBC and BR2_TOOLCHAIN_USES_GLIBC, that exist regardless of the toolchain backend. The entire Buildroot code base is converted to use those options. Note that we have intentionally created only one option (BR2_TOOLCHAIN_USES_GLIBC) for both glibc and eglibc, since they are essentially the same, as far as Buildroot is concerned. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/elfutils/Config.in | 9 ++------- package/elfutils/elfutils.mk | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'package/elfutils') diff --git a/package/elfutils/Config.in b/package/elfutils/Config.in index 914eec6e5..c6a2b8485 100644 --- a/package/elfutils/Config.in +++ b/package/elfutils/Config.in @@ -3,10 +3,7 @@ comment "elfutils requires a toolchain with LARGEFILE and WCHAR support" config BR2_PACKAGE_ELFUTILS bool "elfutils" - select BR2_PACKAGE_ARGP_STANDALONE if \ - BR2_TOOLCHAIN_BUILDROOT || \ - BR2_TOOLCHAIN_CTNG_uClibc || \ - BR2_TOOLCHAIN_EXTERNAL_UCLIBC + select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT depends on BR2_LARGEFILE depends on BR2_USE_WCHAR @@ -23,9 +20,7 @@ if BR2_PACKAGE_ELFUTILS config BR2_PACKAGE_ELFUTILS_PROGS bool "Install programs" - depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || \ - BR2_TOOLCHAIN_CTNG_glibc || \ - BR2_TOOLCHAIN_CTNG_eglibc + depends on BR2_TOOLCHAIN_USES_GLIBC help This option tells elfutils to not only install the libelf libraries, but also the elfutils programs. diff --git a/package/elfutils/elfutils.mk b/package/elfutils/elfutils.mk index 265878660..696b5667a 100644 --- a/package/elfutils/elfutils.mk +++ b/package/elfutils/elfutils.mk @@ -37,7 +37,7 @@ endif ELFUTILS_CONF_ENV += \ LDFLAGS="$(ELFUTILS_LDFLAGS)" -ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ELFUTILS_DEPENDENCIES += argp-standalone endif -- cgit v1.2.3