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/Makefile.in | 2 +- package/boost/boost.mk | 2 +- package/elfutils/Config.in | 9 ++------- package/elfutils/elfutils.mk | 2 +- package/freescale-imx/gpu-viv-bin-mx6q/Config.in | 8 ++------ package/gpsd/Config.in | 4 ++-- package/gsl/gsl.mk | 2 +- package/iozone/iozone.mk | 2 +- package/libv4l/Config.in | 8 ++++---- package/ltp-testsuite/Config.in | 2 +- package/mongrel2/Config.in | 4 +--- package/multimedia/gst-plugin-x170/Config.in | 4 +--- package/multimedia/on2-8170-libs/Config.in | 4 +--- package/nbd/nbd.mk | 2 +- package/network-manager/network-manager.mk | 2 +- package/nss-mdns/Config.in | 2 +- package/php/php.mk | 2 +- package/squid/squid.mk | 2 +- package/tzdata/Config.in | 2 +- 19 files changed, 25 insertions(+), 40 deletions(-) (limited to 'package') diff --git a/package/Makefile.in b/package/Makefile.in index 6835de396..405b3e437 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -23,7 +23,7 @@ MAKE:=$(HOSTMAKE) -j$(PARALLEL_JOBS) # Compute GNU_TARGET_NAME GNU_TARGET_NAME=$(ARCH)-buildroot-linux-$(LIBC)$(ABI) -ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) LIBC=uclibc else LIBC=gnu diff --git a/package/boost/boost.mk b/package/boost/boost.mk index ce729901a..160a9f1fe 100644 --- a/package/boost/boost.mk +++ b/package/boost/boost.mk @@ -59,7 +59,7 @@ BOOST_OPT += toolset=gcc \ runtime-link=$(if $(BR2_PREFER_STATIC_LIB),static,shared) ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y) -ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # posix backend needs monetary.h which isn't available on uClibc BOOST_OPT += boost.locale.posix=off endif 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 diff --git a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in index 06544c406..e80eae434 100644 --- a/package/freescale-imx/gpu-viv-bin-mx6q/Config.in +++ b/package/freescale-imx/gpu-viv-bin-mx6q/Config.in @@ -1,7 +1,5 @@ comment "gpu-viv-bin-mx6q requires a glibc toolchain" - depends on !(BR2_TOOLCHAIN_CTNG_glibc || \ - BR2_TOOLCHAIN_CTNG_eglibc || \ - BR2_TOOLCHAIN_EXTERNAL_GLIBC) + depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_GPU_VIV_BIN_MX6Q bool "gpu-viv-bin-mx6q" @@ -9,9 +7,7 @@ config BR2_PACKAGE_GPU_VIV_BIN_MX6Q select BR2_PACKAGE_HAS_OPENGL_ES depends on BR2_arm # Only relevant for i.MX6 # Library binaries are linked against libc.so.6 - depends on BR2_TOOLCHAIN_CTNG_glibc || \ - BR2_TOOLCHAIN_CTNG_eglibc || \ - BR2_TOOLCHAIN_EXTERNAL_GLIBC + depends on BR2_TOOLCHAIN_USES_GLIBC help Userspace libraries for Vivante GPU on i.MX6 platforms diff --git a/package/gpsd/Config.in b/package/gpsd/Config.in index 337f8e731..70c8cbf25 100644 --- a/package/gpsd/Config.in +++ b/package/gpsd/Config.in @@ -32,10 +32,10 @@ config BR2_PACKAGE_GPSD_OLDSTYLE config BR2_PACKAGE_GPSD_PROFILING bool "profiling support" - depends on !BR2_TOOLCHAIN_BUILDROOT && !BR2_TOOLCHAIN_CTNG_uClibc && !BR2_TOOLCHAIN_EXTERNAL_UCLIBC + depends on BR2_TOOLCHAIN_USES_GLIBC comment "profiling support not available with uClibc-based toolchain" - depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_CTNG_uClibc || BR2_TOOLCHAIN_EXTERNAL_UCLIBC + depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_GPSD_NTP_SHM bool "NTP time hinting support" diff --git a/package/gsl/gsl.mk b/package/gsl/gsl.mk index 68b9948cc..c32a0ebfa 100644 --- a/package/gsl/gsl.mk +++ b/package/gsl/gsl.mk @@ -17,7 +17,7 @@ GSL_CONFIG_SCRIPTS = gsl-config # at: http://lists.busybox.net/pipermail/uclibc/2012-October/047067.html. # So we tell gsl that fenv related functions are not available in this # case. -ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ifneq ($(BR2_i386),y) GSL_CONF_ENV = \ ac_cv_have_decl_feenableexcept=no \ diff --git a/package/iozone/iozone.mk b/package/iozone/iozone.mk index 970e50982..328a5269d 100644 --- a/package/iozone/iozone.mk +++ b/package/iozone/iozone.mk @@ -15,7 +15,7 @@ IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) IOZONE_TARGET = linux-noth # AIO support not available on uClibc, use the linux (non-aio) target. -else ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) +else ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) IOZONE_TARGET = linux-noaio else IOZONE_TARGET = linux diff --git a/package/libv4l/Config.in b/package/libv4l/Config.in index 70f20ac56..de4af302b 100644 --- a/package/libv4l/Config.in +++ b/package/libv4l/Config.in @@ -13,21 +13,21 @@ if BR2_PACKAGE_LIBV4L config BR2_PACKAGE_LIBV4L_DECODE_TM6000 bool "decode_tm6000" - depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc + depends on BR2_TOOLCHAIN_USES_GLIBC help Tool to decode tm6000 proprietary format streams comment "decode_tm6000 requires a GLIBC based toolchain" - depends on !(BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc) + depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_LIBV4L_IR_KEYTABLE bool "ir-keytable" - depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc + depends on BR2_TOOLCHAIN_USES_GLIBC help Tool to alter keymaps of Remote Controller devices comment "ir-keytable requires a GLIBC based toolchain" - depends on !(BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_glibc || BR2_TOOLCHAIN_CTNG_eglibc) + depends on !BR2_TOOLCHAIN_USES_GLIBC config BR2_PACKAGE_LIBV4L_V4L2_COMPLIANCE bool "v4l2-compliance" diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in index 46e7380d8..75b029ffc 100644 --- a/package/ltp-testsuite/Config.in +++ b/package/ltp-testsuite/Config.in @@ -1,6 +1,6 @@ comment "ltp-testsuite needs specific uClibc options, see help" depends on BR2_PACKAGE_LTP_TESTSUITE - depends on BR2_TOOLCHAIN_BUILDROOT || BR2_TOOLCHAIN_EXTERNAL_UCLIBC || BR2_TOOLCHAIN_CTNG_uClibc + depends on BR2_TOOLCHAIN_USES_UCLIBC config BR2_PACKAGE_LTP_TESTSUITE bool "ltp-testsuite" diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in index cd9323639..ca7e6093d 100644 --- a/package/mongrel2/Config.in +++ b/package/mongrel2/Config.in @@ -9,9 +9,7 @@ config BR2_PACKAGE_MONGREL2 # {get,make,swap}context functions present in # {e,}glibc and in uClibc's master branch. Source has arm workaround depends on BR2_UCLIBC_VERSION_SNAPSHOT || \ - BR2_TOOLCHAIN_EXTERNAL_GLIBC || \ - BR2_TOOLCHAIN_CTNG_eglibc || \ - BR2_TOOLCHAIN_CTNG_glibc || \ + BR2_TOOLCHAIN_USES_GLIBC || \ BR2_arm help Mongrel2 is an application, language, and network architecture diff --git a/package/multimedia/gst-plugin-x170/Config.in b/package/multimedia/gst-plugin-x170/Config.in index fd9394760..9a1ae639c 100644 --- a/package/multimedia/gst-plugin-x170/Config.in +++ b/package/multimedia/gst-plugin-x170/Config.in @@ -2,9 +2,7 @@ config BR2_PACKAGE_GST_PLUGIN_X170 bool "gst-plugin-x170" depends on BR2_PACKAGE_GSTREAMER depends on BR2_arm926t - depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \ - BR2_TOOLCHAIN_CTNG_eglibc || \ - BR2_TOOLCHAIN_CTNG_glibc) # on2-8170-libs + depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs select BR2_PACKAGE_ON2_8170_LIBS help GStreamer plug-in to use the Hantro X170 video decoder present on diff --git a/package/multimedia/on2-8170-libs/Config.in b/package/multimedia/on2-8170-libs/Config.in index 0cf05add9..8c2d96381 100644 --- a/package/multimedia/on2-8170-libs/Config.in +++ b/package/multimedia/on2-8170-libs/Config.in @@ -1,9 +1,7 @@ config BR2_PACKAGE_ON2_8170_LIBS #This is a binary only package which has been compiled for glibc depends on BR2_arm926t - depends on (BR2_TOOLCHAIN_EXTERNAL_GLIBC || \ - BR2_TOOLCHAIN_CTNG_eglibc || \ - BR2_TOOLCHAIN_CTNG_glibc) + depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_LINUX_KERNEL # on2-8170-modules select BR2_PACKAGE_ON2_8170_MODULES # runtime bool "on2-8170-libs" diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk index e790a345b..e5b50232f 100644 --- a/package/nbd/nbd.mk +++ b/package/nbd/nbd.mk @@ -11,7 +11,7 @@ NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs) NBD_DEPENDENCIES = libglib2 NBD_LICENSE = GPLv2 -ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) # We have linux/falloc.h # but uClibc lacks fallocate(2) which is a glibc-ism NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 9c143aae1..b4d34088d 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -35,7 +35,7 @@ NETWORK_MANAGER_CONF_OPT = \ --disable-ifnet # uClibc by default doesn't have backtrace support, so don't use it -ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) NETWORK_MANAGER_CONF_OPT += --disable-crashtrace endif diff --git a/package/nss-mdns/Config.in b/package/nss-mdns/Config.in index 1df0ce4b3..b537fa576 100644 --- a/package/nss-mdns/Config.in +++ b/package/nss-mdns/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_NSS_MDNS bool "nss-mdns" # libdaemon->avahi uses fork() depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_glibc + depends on BR2_TOOLCHAIN_USES_GLIBC depends on BR2_PACKAGE_AVAHI_DAEMON help nss-mdns is a plugin for the GNU Name Service Switch (NSS) diff --git a/package/php/php.mk b/package/php/php.mk index 07f396eed..299395f9f 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -24,7 +24,7 @@ PHP_CONFIG_SCRIPTS = php-config PHP_CFLAGS = $(TARGET_CFLAGS) # Workaround for non-IPv6 uClibc toolchain -ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) ifneq ($(BR2_INET_IPV6),y) PHP_CFLAGS += -DHAVE_DEPRECATED_DNS_FUNCS endif diff --git a/package/squid/squid.mk b/package/squid/squid.mk index 4dd14042e..e3daa3200 100644 --- a/package/squid/squid.mk +++ b/package/squid/squid.mk @@ -26,7 +26,7 @@ SQUID_CONF_OPT = --enable-async-io=8 --enable-linux-netfilter \ --enable-external-acl-helpers="ip_user" # On uClibc librt needs libpthread -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),yy) +ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy) SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread" endif diff --git a/package/tzdata/Config.in b/package/tzdata/Config.in index 4e68a97b5..dec5f86c2 100644 --- a/package/tzdata/Config.in +++ b/package/tzdata/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_TZDATA bool "tzdata" - depends on BR2_TOOLCHAIN_EXTERNAL_GLIBC || BR2_TOOLCHAIN_CTNG_eglibc || BR2_TOOLCHAIN_CTNG_glibc + depends on BR2_TOOLCHAIN_USES_GLIBC help Time zone database -- cgit v1.2.3