* [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts
@ 2011-03-07 22:28 Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 1/9] Rename BR2_LARGEFILE to BR2_TOOLCHAIN_HAS_LARGEFILE Thomas Petazzoni
` (9 more replies)
0 siblings, 10 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Hello,
During the post-FOSDEM Buildroot Developer Day, we decided to clean up
and clarify the name of the toolchain options concerning large file,
IPv6, RPC, locale, program invocation, C++, etc. The goal is to have
something more coherent and more meaningful, so all options are now
named BR2_TOOLCHAIN_HAS_xxx.
The last commit is just a cleanup patch that fixes tab or space issues
in various Config.in files.
Thomas
The following changes since commit 0a064b48c9d1044b05aee65272f5af7f28879473:
Gustavo Zacarias (1):
gst-ffmpeg: bump to version 0.10.11
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.05/rename-toolchain-config-opts
Thomas Petazzoni (9):
Rename BR2_LARGEFILE to BR2_TOOLCHAIN_HAS_LARGEFILE
Rename BR2_INET_IPV6 to BR2_TOOLCHAIN_HAS_IPV6
Rename BR2_INET_RPC to BR2_TOOLCHAIN_HAS_RPC
Rename BR2_USE_WCHAR to BR2_TOOLCHAIN_HAS_WCHAR
Rename BR2_ENABLE_LOCALE_{PURGE,WHITELIST} to BR2_LOCALE_{PURGE,WHITELIST}
Rename BR2_ENABLE_LOCALE to BR2_TOOLCHAIN_HAS_LOCALE
Rename BR2_PROGRAM_INVOCATION to BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
Rename BR2_INSTALL_LIBSTDCPP to BR2_TOOLCHAIN_HAS_CPP
Fix minor spacing/tabs issues in package/*/Config.in
Makefile | 6 ++--
boot/grub/grub.mk | 2 +-
boot/grub2/grub2.mk | 2 +-
configs/arm_nptl_toolchain_defconfig | 12 +++---
configs/arm_toolchain_defconfig | 12 +++---
package/Makefile.in | 10 +++---
package/alsamixergui/Config.in | 4 +-
package/atk/Config.in | 4 +-
package/axel/axel.mk | 2 +-
package/bind/Config.in | 4 +-
package/bison/Config.in | 4 +-
package/blackbox/Config.in | 6 ++--
package/blackbox/blackbox.mk | 2 +-
package/bmon/Config.in | 4 +-
package/bootutils/Config.in | 4 +-
package/busybox/busybox.mk | 6 ++--
package/bzip2/bzip2.mk | 2 +-
package/cdrkit/Config.in | 4 +-
package/coreutils/Config.in | 4 +-
package/cramfs/Config.in | 10 +++---
package/ctorrent/Config.in | 4 +-
package/cups/Config.in | 4 +-
package/cvs/Config.in | 2 +-
package/dbus-glib/Config.in | 4 +-
package/dbus-python/Config.in | 4 +-
package/dialog/Config.in | 2 +-
package/dialog/dialog.mk | 2 +-
package/diffutils/Config.in | 2 +-
package/dmalloc/dmalloc.mk | 2 +-
package/dmraid/Config.in | 4 +-
package/dnsmasq/Config.in | 2 +-
package/dnsmasq/dnsmasq.mk | 4 +-
package/docker/Config.in | 4 +-
package/dosfstools/Config.in | 4 +-
package/e2fsprogs/Config.in | 4 +-
package/enchant/Config.in | 6 ++--
package/expat/Config.in | 2 +-
package/findutils/Config.in | 4 +-
package/fltk/Config.in | 4 +-
package/fuse/Config.in | 4 +-
package/gamin/Config.in | 4 +-
package/gamin/gamin.mk | 2 +-
package/gawk/Config.in | 2 +-
package/gdk-pixbuf/Config.in | 4 +-
package/gdk-pixbuf/gdk-pixbuf.mk | 4 +-
package/genext2fs/Config.in | 14 ++++----
package/genromfs/Config.in | 8 ++--
package/gettext/Config.in | 6 ++--
package/gmpc/Config.in | 6 ++--
package/gob2/Config.in | 4 +-
package/gperf/Config.in | 4 +-
package/gpsd/gpsd.mk | 2 +-
package/grep/Config.in | 4 +-
package/gvfs/Config.in | 6 ++--
package/hal/Config.in | 6 ++--
package/hdparm/Config.in | 4 +-
package/hostapd/hostapd.mk | 2 +-
package/i2c-tools/Config.in | 14 ++++----
package/icu/Config.in | 6 ++--
package/imagemagick/imagemagick.mk | 2 +-
package/iperf/Config.in | 4 +-
package/ipsec-tools/ipsec-tools.mk | 2 +-
package/iptables/Config.in | 4 +-
package/iptables/iptables.mk | 2 +-
package/kismet/Config.in | 4 +-
package/libarchive/Config.in | 4 +-
package/libcgicc/Config.in | 4 +-
package/libconfig/libconfig.mk | 2 +-
package/libdrm/Config.in | 4 +-
package/libelf/libelf.mk | 2 +-
package/libglade/Config.in | 4 +-
package/libglib2/Config.in | 6 ++--
package/libglib2/libglib2.mk | 4 +-
package/libgtk2/Config.in | 6 ++--
package/libiconv/Config.in | 2 +-
package/libiconv/libiconv.mk | 2 +-
package/librsvg/Config.in | 2 +-
package/libsigc/Config.in | 4 +-
package/libsoup/Config.in | 4 +-
package/libsoup/libsoup.mk | 2 +-
package/libupnp/Config.in | 4 +-
package/libxml2/libxml2.mk | 2 +-
package/lighttpd/lighttpd.mk | 2 +-
package/lmbench/Config.in | 4 +-
package/logrotate/Config.in | 4 +-
package/lsof/Config.in | 4 +-
package/lsof/lsof.mk | 8 ++--
package/luafilesystem/luafilesystem.mk | 2 +-
package/lvm2/Config.in | 4 +-
package/lzma/Config.in | 4 +-
package/m4/Config.in | 4 +-
package/m4/m4.mk | 2 +-
package/makedevs/Config.in | 8 ++--
package/memtester/Config.in | 4 +-
package/midori/Config.in | 6 ++--
package/mtd/Config.in | 4 +-
package/multimedia/alsa-utils/Config.in | 8 ++--
package/multimedia/festival/Config.in | 4 +-
package/multimedia/festival/speech-tools/Config.in | 4 +-
package/multimedia/ffmpeg/Config.in | 7 ++--
package/multimedia/gst-ffmpeg/Config.in | 7 ++--
package/multimedia/gst-plugins-bad/Config.in | 4 +-
package/multimedia/gst-plugins-base/Config.in | 4 +-
package/multimedia/gst-plugins-good/Config.in | 4 +-
package/multimedia/gstreamer/Config.in | 4 +-
package/multimedia/libdvdnav/Config.in | 4 +-
package/multimedia/libdvdread/Config.in | 4 +-
package/multimedia/libmms/Config.in | 4 +-
package/multimedia/libmpd/Config.in | 6 ++--
package/multimedia/mpd/Config.in | 12 +++---
package/multimedia/mplayer/mplayer.mk | 4 +-
package/multimedia/swfdec/Config.in | 6 ++--
package/multimedia/taglib/Config.in | 4 +-
package/multimedia/wavpack/Config.in | 2 +-
package/multimedia/wavpack/wavpack.mk | 2 +-
package/mutt/Config.in | 4 +-
package/mysql_client/Config.in | 4 +-
package/nbd/Config.in | 4 +-
package/nbd/nbd.mk | 2 +-
package/ncftp/Config.in | 4 +-
package/netkitbase/Config.in | 4 +-
package/netkittelnet/Config.in | 4 +-
package/netsnmp/netsnmp.mk | 2 +-
package/nfs-utils/Config.in | 6 ++--
package/ntfs-3g/Config.in | 6 ++--
package/ntfsprogs/Config.in | 6 ++--
package/ntp/ntp.mk | 2 +-
package/olsr/Config.in | 4 +-
package/oprofile/Config.in | 4 +-
package/pango/Config.in | 6 ++--
package/patch/Config.in | 4 +-
package/pcmanfm/Config.in | 4 +-
package/pcre/pcre.mk | 2 +-
package/php/Config.ext | 8 ++--
package/php/php.mk | 4 +-
package/pkg-config/Config.in | 4 +-
package/portmap/Config.in | 4 +-
package/pppd/pppd.mk | 2 +-
package/python/Config.in | 4 +-
package/qt/Config.in | 4 +-
package/qt/qt.mk | 4 +-
package/quagga/Config.in | 4 +-
package/radvd/Config.in | 2 +-
package/rpm/Config.in | 4 +-
package/rrdtool/Config.in | 4 +-
package/ruby/Config.in | 4 +-
package/samba/Config.in | 2 +-
package/samba/samba.mk | 4 +-
package/sdl_sound/Config.in | 2 +-
package/sdl_sound/sdl_sound.mk | 2 +-
package/sed/Config.in | 2 +-
package/sfdisk/sfdisk.mk | 2 +-
package/shared-mime-info/Config.in | 4 +-
package/smartmontools/Config.in | 4 +-
package/spawn-fcgi/spawn-fcgi.mk | 2 +-
package/sqlite/sqlite.mk | 2 +-
package/squashfs/Config.in | 4 +-
package/squashfs3/Config.in | 4 +-
package/squid/Config.in | 6 ++--
package/sshfs/Config.in | 8 ++--
package/sshfs/sshfs.mk | 2 +-
package/strace/strace.mk | 2 +-
package/synergy/Config.in | 6 ++--
package/sysklogd/Config.in | 4 +-
package/tar/Config.in | 4 +-
package/udev/udev.mk | 2 +-
package/udpcast/Config.in | 4 +-
package/usbutils/Config.in | 4 +-
package/util-linux/Config.in | 4 +-
package/webkit/Config.in | 6 ++--
package/wget/Config.in | 4 +-
package/wipe/wipe.mk | 2 +-
package/x11r7/Config.in | 8 ++--
package/x11r7/mesa3d/Config.in | 2 +-
package/x11r7/xlib_libpciaccess/Config.in | 4 +-
package/xerces/Config.in | 5 ++-
package/xfsprogs/Config.in | 4 +-
package/xmlstarlet/Config.in | 2 +-
target/xtensa/defconfig | 6 ++--
toolchain/dependencies/dependencies.sh | 2 +-
toolchain/gcc/Config.in | 4 +-
toolchain/gcc/gcc-uclibc-4.x.mk | 6 ++--
toolchain/gdb/Config.in | 4 +-
toolchain/gdb/gdb.mk | 2 +-
toolchain/helpers.mk | 24 ++++++------
toolchain/toolchain-buildroot/Config.in.2 | 14 ++++----
toolchain/toolchain-common.in | 22 ++++++------
toolchain/toolchain-crosstool-ng/Config.in | 38 ++++++++++----------
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 14 ++++----
toolchain/toolchain-external/Config.in | 38 ++++++++++----------
toolchain/toolchain-external/ext-tool.mk | 6 ++--
toolchain/uClibc/uclibc.mk | 12 +++---
192 files changed, 470 insertions(+), 467 deletions(-)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 1/9] Rename BR2_LARGEFILE to BR2_TOOLCHAIN_HAS_LARGEFILE
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 2/9] Rename BR2_INET_IPV6 to BR2_TOOLCHAIN_HAS_IPV6 Thomas Petazzoni
` (8 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
boot/grub/grub.mk | 2 +-
boot/grub2/grub2.mk | 2 +-
configs/arm_nptl_toolchain_defconfig | 2 +-
configs/arm_toolchain_defconfig | 2 +-
package/Makefile.in | 4 ++--
package/bind/Config.in | 4 ++--
package/bootutils/Config.in | 4 ++--
package/busybox/busybox.mk | 2 +-
package/bzip2/bzip2.mk | 2 +-
package/cdrkit/Config.in | 4 ++--
package/dmraid/Config.in | 4 ++--
package/dnsmasq/dnsmasq.mk | 2 +-
package/dosfstools/Config.in | 4 ++--
package/e2fsprogs/Config.in | 4 ++--
package/fuse/Config.in | 4 ++--
package/gamin/gamin.mk | 2 +-
package/gdk-pixbuf/gdk-pixbuf.mk | 2 +-
package/gvfs/Config.in | 4 ++--
package/hdparm/Config.in | 4 ++--
package/imagemagick/imagemagick.mk | 2 +-
package/iptables/Config.in | 4 ++--
package/libdrm/Config.in | 4 ++--
package/libelf/libelf.mk | 2 +-
package/libupnp/Config.in | 4 ++--
package/libxml2/libxml2.mk | 2 +-
package/lighttpd/lighttpd.mk | 2 +-
package/lsof/lsof.mk | 2 +-
package/luafilesystem/luafilesystem.mk | 2 +-
package/lvm2/Config.in | 4 ++--
package/memtester/Config.in | 4 ++--
package/multimedia/alsa-utils/Config.in | 4 ++--
package/multimedia/ffmpeg/Config.in | 4 ++--
package/multimedia/gst-ffmpeg/Config.in | 4 ++--
package/multimedia/gst-plugins-bad/Config.in | 4 ++--
package/multimedia/libdvdnav/Config.in | 4 ++--
package/multimedia/libdvdread/Config.in | 4 ++--
package/multimedia/mpd/Config.in | 4 ++--
package/multimedia/mplayer/mplayer.mk | 2 +-
package/nbd/nbd.mk | 2 +-
package/ncftp/Config.in | 4 ++--
package/nfs-utils/Config.in | 4 ++--
package/ntfs-3g/Config.in | 4 ++--
package/ntfsprogs/Config.in | 4 ++--
package/php/php.mk | 4 ++--
package/qt/qt.mk | 2 +-
package/sfdisk/sfdisk.mk | 2 +-
package/sqlite/sqlite.mk | 2 +-
package/squashfs/Config.in | 4 ++--
package/squashfs3/Config.in | 4 ++--
package/sshfs/Config.in | 4 ++--
package/strace/strace.mk | 2 +-
package/sysklogd/Config.in | 4 ++--
package/udev/udev.mk | 2 +-
package/udpcast/Config.in | 4 ++--
package/wipe/wipe.mk | 2 +-
package/x11r7/Config.in | 4 ++--
package/x11r7/xlib_libpciaccess/Config.in | 4 ++--
package/xfsprogs/Config.in | 4 ++--
target/xtensa/defconfig | 2 +-
toolchain/gcc/Config.in | 2 +-
toolchain/helpers.mk | 4 ++--
toolchain/toolchain-buildroot/Config.in.2 | 2 +-
toolchain/toolchain-common.in | 2 +-
toolchain/toolchain-crosstool-ng/Config.in | 6 +++---
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
toolchain/toolchain-external/Config.in | 4 ++--
toolchain/uClibc/uclibc.mk | 2 +-
67 files changed, 106 insertions(+), 106 deletions(-)
diff --git a/boot/grub/grub.mk b/boot/grub/grub.mk
index 401d346..cf5d118 100644
--- a/boot/grub/grub.mk
+++ b/boot/grub/grub.mk
@@ -15,7 +15,7 @@ GRUB_SPLASHIMAGE=$(TOPDIR)/boot/grub/splash.xpm.gz
GRUB_CFLAGS=-DSUPPORT_LOOPDEV
-ifeq ($(BR2_LARGEFILE),)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),)
GRUB_CFLAGS+=-U_FILE_OFFSET_BITS
endif
diff --git a/boot/grub2/grub2.mk b/boot/grub2/grub2.mk
index f939d9a..5a08c95 100644
--- a/boot/grub2/grub2.mk
+++ b/boot/grub2/grub2.mk
@@ -20,7 +20,7 @@ GRUB2_CAT:=$(ZCAT)
GRUB2_DIR:=$(BUILD_DIR)/grub-1.98
GRUB2_CFLAGS=-DSUPPORT_LOOPDEV
-ifeq ($(BR2_LARGEFILE),)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),)
GRUB2_CFLAGS+=-U_FILE_OFFSET_BITS
endif
diff --git a/configs/arm_nptl_toolchain_defconfig b/configs/arm_nptl_toolchain_defconfig
index 8100073..78dc557 100644
--- a/configs/arm_nptl_toolchain_defconfig
+++ b/configs/arm_nptl_toolchain_defconfig
@@ -3,7 +3,7 @@ BR2_arm=y
BR2_arm926t=y
# Toolchain options
-BR2_LARGEFILE=y
+BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 8bc97c9..7fa51c2 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -2,7 +2,7 @@
BR2_arm=y
# Common Toolchain Options
-BR2_LARGEFILE=y
+BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_INET_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
diff --git a/package/Makefile.in b/package/Makefile.in
index ef2c591..4aa52dc 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -94,7 +94,7 @@ ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy)
TARGET_CFLAGS+=-fno-pic -mno-abicalls
endif
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
endif
@@ -295,7 +295,7 @@ else
DISABLE_NLS:=--disable-nls
endif
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
DISABLE_LARGEFILE= --disable-largefile
endif
diff --git a/package/bind/Config.in b/package/bind/Config.in
index 827ee26..f3a9ab4 100644
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_BIND
bool "bind"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
BIND (Berkeley Internet Name Domain) is an implementation of
the Domain Name System (DNS) protocols and provides an openly
@@ -28,4 +28,4 @@ config BR2_PACKAGE_BIND_TOOLS
Install tools (host, nslookup, dig, nsupdate)
comment "bind requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/bootutils/Config.in b/package/bootutils/Config.in
index 06a8fd8..d2a91c1 100644
--- a/package/bootutils/Config.in
+++ b/package/bootutils/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_BOOTUTILS
bool "bootutils"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
BootUtils is a collection of utilities to facilitate booting of
Linux 2.6-based systems. The process of finding the root volume
@@ -10,4 +10,4 @@ config BR2_PACKAGE_BOOTUTILS
http://bootutils.pr.linuxrulz.org/
comment "bootutils requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 5583bc6..6764427 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -47,7 +47,7 @@ define BUSYBOX_SET_BB_PWD
endef
endif
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
define BUSYBOX_SET_LARGEFILE
$(call KCONFIG_ENABLE_OPT,CONFIG_LFS,$(BUSYBOX_BUILD_CONFIG))
$(call KCONFIG_ENABLE_OPT,CONFIG_FDISK_SUPPORT_LARGE_DISKS,$(BUSYBOX_BUILD_CONFIG))
diff --git a/package/bzip2/bzip2.mk b/package/bzip2/bzip2.mk
index 123e579..3b8ee7d 100644
--- a/package/bzip2/bzip2.mk
+++ b/package/bzip2/bzip2.mk
@@ -24,7 +24,7 @@ define BZIP2_NOLARGEFILE_FIX_MAKEFILE
$(SED) "s,^BIGFILES,#BIGFILES,g" $(@D)/Makefile-libbz2_so
endef
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
BZIP2_POST_PATCH_HOOKS += BZIP2_NOLARGEFILE_FIX_MAKEFILE
endif
diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in
index 7ff50f3..ecfc1ca 100644
--- a/package/cdrkit/Config.in
+++ b/package/cdrkit/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_CDRKIT
# Needed for libbz
select BR2_PACKAGE_BZIP2
select BR2_PACKAGE_LIBCAP
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
bool "cdrkit"
help
cdrkit is a suite of programs for recording CDs and DVDs,
@@ -12,4 +12,4 @@ config BR2_PACKAGE_CDRKIT
http://www.cdrkit.org/
comment "cdrkit requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/dmraid/Config.in b/package/dmraid/Config.in
index 7b37244..b858894 100644
--- a/package/dmraid/Config.in
+++ b/package/dmraid/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_DMRAID
bool "dmraid"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_PACKAGE_LVM2
help
dmraid discovers, activates, deactivates and displays properties
@@ -10,4 +10,4 @@ config BR2_PACKAGE_DMRAID
respective mappings for the ATARAID sets discovered.
comment "dmraid requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 976e1d6..9347ee5 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -28,7 +28,7 @@ ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y)
DNSMASQ_MAKE_ENV += LDFLAGS+="-lintl"
endif
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
DNSMASQ_COPTS += -DNO_LARGEFILE
endif
diff --git a/package/dosfstools/Config.in b/package/dosfstools/Config.in
index 1b92026..535d7ae 100644
--- a/package/dosfstools/Config.in
+++ b/package/dosfstools/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_DOSFSTOOLS
bool "dosfstools"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
Tools for creating and checking DOS FAT filesystems.
@@ -25,4 +25,4 @@ config BR2_PACKAGE_DOSFSTOOLS_DOSFSLABEL
Get or set the DOS FAT filesystem label.
comment "dosfstools requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/e2fsprogs/Config.in b/package/e2fsprogs/Config.in
index 2bb92d9..f2669af 100644
--- a/package/e2fsprogs/Config.in
+++ b/package/e2fsprogs/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_E2FSPROGS
bool "e2fsprogs"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
The EXT2 file system utilities and libraries
@@ -135,5 +135,5 @@ config BR2_PACKAGE_E2FSPROGS_LIBBLKID
endmenu
comment "e2fsprogs requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/fuse/Config.in b/package/fuse/Config.in
index dffadf8..d1d70d1 100644
--- a/package/fuse/Config.in
+++ b/package/fuse/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_LIBFUSE
bool "libfuse"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
FUSE (Filesystem in UserSpacE)
http://fuse.sourceforge.net/
comment "libfuse requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/gamin/gamin.mk b/package/gamin/gamin.mk
index f0600b2..3a978ef 100644
--- a/package/gamin/gamin.mk
+++ b/package/gamin/gamin.mk
@@ -17,7 +17,7 @@ GAMIN_CONF_OPT += --without-python
GAMIN_CONF_ENV = have_abstract_sockets=no
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
GAMIN_CONF_ENV += CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
endif
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index cf915bb..83c59bf 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -16,7 +16,7 @@ GDK_PIXBUF_CONF_ENV = \
GDK_PIXBUF_CONF_OPT = --disable-glibtest
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
GDK_PIXBUF_CONF_OPT += --disable-largefile
endif
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 04fce93..22c93ef 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GVFS
bool "gvfs"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
depends on BR2_USE_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_EXPAT # needed by dbus(-glib)
@@ -17,4 +17,4 @@ config BR2_PACKAGE_GVFS
http://en.wikipedia.org/wiki/GVFS
comment "gvfs requires a toolchain with LARGEFILE and WCHAR support"
- depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/hdparm/Config.in b/package/hdparm/Config.in
index 32bd247..f82c85a 100644
--- a/package/hdparm/Config.in
+++ b/package/hdparm/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_HDPARM
bool "hdparm"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
hdparm - get/set hard disk parameters for Linux IDE drives.
http://www.ibiblio.org/pub/Linux/system/hardware/
comment "hdparm requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk
index 97c0041..5cd6275 100644
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@ -11,7 +11,7 @@ IMAGEMAGICK_SITE = ftp://ftp.imagemagick.org/pub/ImageMagick
IMAGEMAGICK_INSTALL_STAGING = YES
IMAGEMAGICK_AUTORECONF = YES
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64
else
IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=32
diff --git a/package/iptables/Config.in b/package/iptables/Config.in
index da5a832..58039bf 100644
--- a/package/iptables/Config.in
+++ b/package/iptables/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_IPTABLES
bool "iptables"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
Linux kernel (2.4+) firewall, NAT, and packet mangling tools.
http://www.iptables.org/
comment "iptables requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index d68f9d5..8560115 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_LIBDRM
bool "libdrm"
depends on BR2_PACKAGE_XORG7
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XLIB_LIBXXF86VM
@@ -15,4 +15,4 @@ config BR2_PACKAGE_LIBDRM
http://dri.freedesktop.org/libdrm/
comment "libdrm requires a toolchain with LARGEFILE support"
- depends on BR2_PACKAGE_XORG7 && !BR2_LARGEFILE
+ depends on BR2_PACKAGE_XORG7 && !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/libelf/libelf.mk b/package/libelf/libelf.mk
index 2a7d066..c838d43 100644
--- a/package/libelf/libelf.mk
+++ b/package/libelf/libelf.mk
@@ -16,6 +16,6 @@ LIBELD_CONF_ENV = libelf_cv_working_memmove=yes \
LIBELF_CONF_OPT = --enable-shared --disable-sanity-checks \
$(if $(BR2_ENABLE_DEBUG),--enable-debug,--disable-debug) \
- $(if $(BR2_LARGEFILE),--enable-elf64)
+ $(if $(BR2_TOOLCHAIN_HAS_LARGEFILE),--enable-elf64)
$(eval $(call AUTOTARGETS,package,libelf))
diff --git a/package/libupnp/Config.in b/package/libupnp/Config.in
index 2e6edcd..a033996 100644
--- a/package/libupnp/Config.in
+++ b/package/libupnp/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBUPNP
bool "libupnp"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
The portable SDK for UPnP(tm) Devices (libupnp) provides developers
with an API and open source code for building control points,
@@ -10,4 +10,4 @@ config BR2_PACKAGE_LIBUPNP
http://pupnp.sourceforge.net/
comment "libupnp requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk
index d07f631..fcfd14a 100644
--- a/package/libxml2/libxml2.mk
+++ b/package/libxml2/libxml2.mk
@@ -8,7 +8,7 @@ LIBXML2_VERSION = 2.7.8
LIBXML2_SITE = ftp://xmlsoft.org/libxml2
LIBXML2_INSTALL_STAGING = YES
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE"
endif
diff --git a/package/lighttpd/lighttpd.mk b/package/lighttpd/lighttpd.mk
index 67cd272..22e4974 100644
--- a/package/lighttpd/lighttpd.mk
+++ b/package/lighttpd/lighttpd.mk
@@ -12,7 +12,7 @@ LIGHTTPD_CONF_OPT = \
--libexecdir=/usr/lib \
--localstatedir=/var \
--program-prefix="" \
- $(if $(BR2_LARGEFILE),,--disable-lfs)
+ $(if $(BR2_TOOLCHAIN_HAS_LARGEFILE),,--disable-lfs)
ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y)
LIGHTTPD_DEPENDENCIES += openssl
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 167cb20..18783d0 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -8,7 +8,7 @@ LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2
LSOF_SITE = ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
BR2_LSOF_CFLAGS =
-ifeq ($(BR2_LARGEFILE),)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),)
BR2_LSOF_CFLAGS += -U_FILE_OFFSET_BITS
endif
ifeq ($(BR2_INET_IPV6),)
diff --git a/package/luafilesystem/luafilesystem.mk b/package/luafilesystem/luafilesystem.mk
index 5f1119a..8d8a047 100644
--- a/package/luafilesystem/luafilesystem.mk
+++ b/package/luafilesystem/luafilesystem.mk
@@ -8,7 +8,7 @@ LUAFILESYSTEM_VERSION = 1.5.0
LUAFILESYSTEM_SITE = http://github.com/downloads/keplerproject/luafilesystem
LUAFILESYSTEM_DEPENDENCIES = lua
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
LFS_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
endif
diff --git a/package/lvm2/Config.in b/package/lvm2/Config.in
index 30af14e..8d860a1 100644
--- a/package/lvm2/Config.in
+++ b/package/lvm2/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LVM2
bool "lvm2 & device mapper"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
This is LVM2, the rewrite of The Linux Logical Volume Manager.
LVM supports enterprise level volume management of disk and disk
@@ -22,4 +22,4 @@ config BR2_PACKAGE_LVM2_DMSETUP_ONLY
Install dmsetup only and skip the LVM2 suite.
comment "lvm2 requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/memtester/Config.in b/package/memtester/Config.in
index 82769f5..ede54d2 100644
--- a/package/memtester/Config.in
+++ b/package/memtester/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_MEMTESTER
bool "memtester"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
A userspace utility for testing the memory subsystem for faults.
http://pyropus.ca/software/memtester/
comment "memtester requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/multimedia/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in
index b85ff7e..b268606 100644
--- a/package/multimedia/alsa-utils/Config.in
+++ b/package/multimedia/alsa-utils/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_ALSA_UTILS
bool "alsa-utils"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_PACKAGE_ALSA_LIB
help
This package contains the command line utilities for the ALSA
@@ -9,7 +9,7 @@ config BR2_PACKAGE_ALSA_UTILS
http://www.alsa-project.org/
comment "alsa-utils requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
if BR2_PACKAGE_ALSA_UTILS
menu "ALSA utils selection"
diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in
index 7a9513c..901a6dd 100644
--- a/package/multimedia/ffmpeg/Config.in
+++ b/package/multimedia/ffmpeg/Config.in
@@ -1,9 +1,9 @@
comment "ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
- depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
+ depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_INET_IPV6)
menuconfig BR2_PACKAGE_FFMPEG
bool "ffmpeg"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
depends on BR2_INET_IPV6
help
FFmpeg is a complete, cross-platform solution to record, convert
diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/multimedia/gst-ffmpeg/Config.in
index 537101e..c4f4681 100644
--- a/package/multimedia/gst-ffmpeg/Config.in
+++ b/package/multimedia/gst-ffmpeg/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_GST_FFMPEG
select BR2_PACKAGE_FFMPEG_GPL
select BR2_PACKAGE_FFMPEG_POSTPROC
select BR2_PACKAGE_FFMPEG_SWSCALE
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
depends on BR2_INET_IPV6
help
GStreamer plugin using FFmpeg.
@@ -14,4 +14,4 @@ config BR2_PACKAGE_GST_FFMPEG
http://gstreamer.freedesktop.org/
comment "gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
- depends on !(BR2_LARGEFILE && BR2_INET_IPV6)
+ depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_INET_IPV6)
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index e25b756..6665110 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -58,11 +58,11 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDNAV
bool "dvdnav"
- depends on BR2_LARGEFILE # libdvdread
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE # libdvdread
select BR2_PACKAGE_LIBDVDNAV
comment "dvdnav requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU
bool "dvdspu"
diff --git a/package/multimedia/libdvdnav/Config.in b/package/multimedia/libdvdnav/Config.in
index 5ba31e8..1936674 100644
--- a/package/multimedia/libdvdnav/Config.in
+++ b/package/multimedia/libdvdnav/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBDVDNAV
bool "libdvdnav"
- depends on BR2_LARGEFILE # libdvdread
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE # libdvdread
select BR2_PACKAGE_LIBDVDREAD
help
libdvdnav is a library that allows easy use of sophisticated
@@ -10,4 +10,4 @@ config BR2_PACKAGE_LIBDVDNAV
http://www.mplayerhq.hu
comment "libdvdnav requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/multimedia/libdvdread/Config.in b/package/multimedia/libdvdread/Config.in
index b63f082..e58e029 100644
--- a/package/multimedia/libdvdread/Config.in
+++ b/package/multimedia/libdvdread/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBDVDREAD
bool "libdvdread"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
libdvdread provides a simple foundation for reading
DVD-Video images.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBDVDREAD
http://www.mplayerhq.hu/MPlayer/releases/dvdnav/
comment "libdvdread requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index b3491f2..66fc2e4 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -59,13 +59,13 @@ config BR2_PACKAGE_MPD_FLAC
config BR2_PACKAGE_MPD_FFMPEG
bool "ffmpeg"
select BR2_PACKAGE_FFMPEG
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
Enable ffmpeg input support.
Select this if you want to play back files supported by ffmpeg.
comment "ffmpeg support requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
config BR2_PACKAGE_MPD_LAME
bool "lame"
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index 7d45960..ac51ece 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -24,7 +24,7 @@ endif
# mplayer unfortunately uses --disable-largefiles, so we cannot use
# DISABLE_LARGEFILE
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
MPLAYER_CONF_OPTS += --enable-largefiles
else
# dvdread/dvdcss requires largefile support
diff --git a/package/nbd/nbd.mk b/package/nbd/nbd.mk
index a09b10b..1cca02a 100644
--- a/package/nbd/nbd.mk
+++ b/package/nbd/nbd.mk
@@ -7,7 +7,7 @@
NBD_VERSION = 2.9.15
NBD_SOURCE = nbd-$(NBD_VERSION).tar.bz2
NBD_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/nbd/
-NBD_CONF_OPT = $(if $(BR2_LARGEFILE),--enable-lfs,--disable-lfs)
+NBD_CONF_OPT = $(if $(BR2_TOOLCHAIN_HAS_LARGEFILE),--enable-lfs,--disable-lfs)
NBD_DEPENDENCIES = libglib2
ifneq ($(BR2_NBD_CLIENT),y)
diff --git a/package/ncftp/Config.in b/package/ncftp/Config.in
index a29934a..2b7f1de 100644
--- a/package/ncftp/Config.in
+++ b/package/ncftp/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_NCFTP
bool "ncftp"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
NcFTP Client (also known as just NcFTP) is a set of FREE application
programs implementing the File Transfer Protocol (FTP).
@@ -33,4 +33,4 @@ config BR2_PACKAGE_NCFTP_BOOKMARKS
endmenu
comment "ncftp requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index 774395b..e7b0566 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_NFS_UTILS
bool "nfs-utils"
depends on BR2_INET_RPC
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
The NFS Linux kernel server.
Warning: We do not force largefile support on here on purpose.
@@ -10,7 +10,7 @@ config BR2_PACKAGE_NFS_UTILS
http://sourceforge.net/projects/nfs
comment "nfs-utils requires a toolchain with RPC and LARGEFILE support"
- depends on !BR2_INET_RPC || !BR2_LARGEFILE
+ depends on !BR2_INET_RPC || !BR2_TOOLCHAIN_HAS_LARGEFILE
menu "NFS utilities selection"
depends on BR2_PACKAGE_NFS_UTILS
diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index 865f9b4..e1e3f0d 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_NTFS_3G
bool "ntfs-3g"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
depends on BR2_USE_WCHAR
help
The NTFS-3G driver is an open source, freely available
@@ -13,4 +13,4 @@ config BR2_PACKAGE_NTFS_3G
http://www.ntfs-3g.org/
comment "ntfs-3g requires a toolchain with LARGEFILE and WCHAR support"
- depends on !(BR2_LARGEFILE && BR2_USE_WCHAR)
+ depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_USE_WCHAR)
diff --git a/package/ntfsprogs/Config.in b/package/ntfsprogs/Config.in
index 836a2b6..d09987a 100644
--- a/package/ntfsprogs/Config.in
+++ b/package/ntfsprogs/Config.in
@@ -1,11 +1,11 @@
config BR2_PACKAGE_NTFSPROGS
bool "ntfsprogs"
depends on BR2_USE_WCHAR
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
wide collection of NTFS utilities
http://www.linux-ntfs.org/
comment "ntfsprogs requires a toolchain with WCHAR and LARGEFILE support"
- depends on !BR2_USE_WCHAR || !BR2_LARGEFILE
+ depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/php/php.mk b/package/php/php.mk
index ad0ae43..ae3aec5 100644
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -142,7 +142,7 @@ endif
### Legacy sqlite2 support
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y)
PHP_CONF_OPT += --with-sqlite
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
PHP_CFLAGS += -DSQLITE_DISABLE_LFS
endif
ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE_UTF8),y)
@@ -161,7 +161,7 @@ else
PHP_CONF_OPT += --with-pdo-sqlite
endif
PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
PHP_CFLAGS += -DSQLITE_DISABLE_LFS
endif
endif
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 6974b2f..a4a1fc8 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -36,7 +36,7 @@ endif
QT_QCONFIG_FILE:=package/qt/qconfig-myfile.h
QT_QCONFIG_FILE_LOCATION:=/src/corelib/global/
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
QT_CONFIGURE+= -largefile
else
QT_CONFIGURE+= -no-largefile
diff --git a/package/sfdisk/sfdisk.mk b/package/sfdisk/sfdisk.mk
index 81c4943..7e5fdaf 100644
--- a/package/sfdisk/sfdisk.mk
+++ b/package/sfdisk/sfdisk.mk
@@ -21,7 +21,7 @@ $(SFDISK_DIR)/.patched: $(DL_DIR)/$(SFDISK_SOURCE)
$(SFDISK_DIR)/sfdisk: $(SFDISK_DIR)/.patched
$(MAKE) \
CROSS=$(TARGET_CROSS) DEBUG=false OPTIMIZATION="$(TARGET_CFLAGS)" \
- DOLFS=$(if $(BR2_LARGEFILE),true,false) -C $(SFDISK_DIR)
+ DOLFS=$(if $(BR2_TOOLCHAIN_HAS_LARGEFILE),true,false) -C $(SFDISK_DIR)
-$(STRIPCMD) $(SFDISK_DIR)/sfdisk
touch -c $(SFDISK_DIR)/sfdisk
diff --git a/package/sqlite/sqlite.mk b/package/sqlite/sqlite.mk
index 30e75a2..8531eb3 100644
--- a/package/sqlite/sqlite.mk
+++ b/package/sqlite/sqlite.mk
@@ -9,7 +9,7 @@ SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz
SQLITE_SITE = http://www.sqlite.org
SQLITE_INSTALL_STAGING = YES
-ifneq ($(BR2_LARGEFILE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
# the sqlite configure script fails to define SQLITE_DISABLE_LFS when
# --disable-largefile is passed, breaking the build. Work around it by
# simply adding it to CFLAGS for configure instead
diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in
index 7d0fc71..8f43b67 100644
--- a/package/squashfs/Config.in
+++ b/package/squashfs/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_SQUASHFS
bool "squashfs"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO)
help
Tools to generate SquashFS filesystems.
@@ -37,4 +37,4 @@ config BR2_PACKAGE_SQUASHFS_XZ
endif
comment "squashfs requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/squashfs3/Config.in b/package/squashfs3/Config.in
index 3291272..bc8622c 100644
--- a/package/squashfs3/Config.in
+++ b/package/squashfs3/Config.in
@@ -1,11 +1,11 @@
config BR2_PACKAGE_SQUASHFS3
bool "squashfs3"
depends on BR2_DEPRECATED
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
Tools to generate SquashFS 3.x filesystems.
http://squashfs.sourceforge.net/
comment "squashfs3 requires a toolchain with LARGEFILE support"
- depends on BR2_DEPRECATED && !BR2_LARGEFILE
+ depends on BR2_DEPRECATED && !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 1d9f759..66fdde7 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_SSHFS
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_OPENSSH
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
depends on BR2_USE_WCHAR # glib2
help
FUSE makes it possible to implement a filesystem in a userspace
@@ -17,4 +17,4 @@ config BR2_PACKAGE_SSHFS
http://fuse.sourceforge.net/sshfs.html
comment "sshfs requires a toolchain with LARGEFILE and WCHAR support"
- depends on !BR2_LARGEFILE || !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE || !BR2_USE_WCHAR
diff --git a/package/strace/strace.mk b/package/strace/strace.mk
index 85e82c1..08612ae 100644
--- a/package/strace/strace.mk
+++ b/package/strace/strace.mk
@@ -10,7 +10,7 @@ STRACE_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/st
STRACE_CONF_ENV = ac_cv_header_linux_if_packet_h=yes \
ac_cv_header_linux_netlink_h=yes \
- $(if $(BR2_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no)
+ $(if $(BR2_TOOLCHAIN_HAS_LARGEFILE),ac_cv_type_stat64=yes,ac_cv_type_stat64=no)
define STRACE_REMOVE_STRACE_GRAPH
rm -f $(TARGET_DIR)/usr/bin/strace-graph
diff --git a/package/sysklogd/Config.in b/package/sysklogd/Config.in
index e3cf2ba..4543013 100644
--- a/package/sysklogd/Config.in
+++ b/package/sysklogd/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_SYSKLOGD
bool "syslogd & klogd"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
System log daemons syslogd and klogd.
http://www.infodrom.org/products/sysklogd/
comment "syslogd requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/udev/udev.mk b/package/udev/udev.mk
index 4b61ce4..b9730c8 100644
--- a/package/udev/udev.mk
+++ b/package/udev/udev.mk
@@ -14,7 +14,7 @@ UDEV_INSTALL_STAGING=YES
# 094 had _GNU_SOURCE set
BR2_UDEV_CFLAGS:= -D_GNU_SOURCE $(TARGET_CFLAGS)
-ifeq ($(BR2_LARGEFILE),)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),)
BR2_UDEV_CFLAGS+=-U_FILE_OFFSET_BITS
endif
diff --git a/package/udpcast/Config.in b/package/udpcast/Config.in
index d7ccfb4..b7e9691 100644
--- a/package/udpcast/Config.in
+++ b/package/udpcast/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_UDPCAST
bool "udpcast"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
A multicast protocol implementation which happens to
be very handy for imaging drives over the network.
@@ -8,7 +8,7 @@ config BR2_PACKAGE_UDPCAST
http://www.udpcast.linux.lu/
comment "udpcast requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
menu "udpcast tools selection"
depends on BR2_PACKAGE_UDPCAST
diff --git a/package/wipe/wipe.mk b/package/wipe/wipe.mk
index d227389..12b1bbb 100644
--- a/package/wipe/wipe.mk
+++ b/package/wipe/wipe.mk
@@ -8,7 +8,7 @@ WIPE_VERSION = 0.22
WIPE_SITE = http://lambda-diode.com/resources/wipe
WIPE_CFLAGS = $(TARGET_CFLAGS) -DHAVE_DEV_URANDOM -DHAVE_OSYNC -DHAVE_STRCASECMP -DHAVE_RANDOM -DSYNC_WAITS_FOR_SYNC -DFIND_DEVICE_SIZE_BY_BLKGETSIZE
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
WIPE_CFLAGS += -DSIXTYFOUR
endif
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index c0c0043..f0b731e 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -19,10 +19,10 @@ choice
config BR2_PACKAGE_XSERVER_xorg
bool "Modular X.org"
- depends on BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_INSTALL_LIBSTDCPP
comment 'X.org requires largefile and C++ support'
- depends on !(BR2_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
+ depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
config BR2_PACKAGE_XSERVER_tinyx
bool "TinyX"
diff --git a/package/x11r7/xlib_libpciaccess/Config.in b/package/x11r7/xlib_libpciaccess/Config.in
index b53aa31..23a91a7 100644
--- a/package/x11r7/xlib_libpciaccess/Config.in
+++ b/package/x11r7/xlib_libpciaccess/Config.in
@@ -1,8 +1,8 @@
config BR2_PACKAGE_XLIB_LIBPCIACCESS
bool "libpciaccess"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
X.Org libpciaccess
comment "libpciaccess requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/xfsprogs/Config.in b/package/xfsprogs/Config.in
index 12bc69e..2131a3b 100644
--- a/package/xfsprogs/Config.in
+++ b/package/xfsprogs/Config.in
@@ -3,11 +3,11 @@ comment "Note that xfsprogs needs a toolchain with UCLIBC_SV4_DEPRECATED and UCL
depends on BR2_PACKAGE_XFSPROGS
comment "xfsprogs requires a toolchain with LARGEFILE support"
- depends on !BR2_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE
config BR2_PACKAGE_XFSPROGS
bool "xfsprogs"
- depends on BR2_LARGEFILE
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_PACKAGE_E2FSPROGS
select BR2_PACKAGE_E2FSPROGS_LIBUUID
help
diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig
index 0eee5c0..63ec81f 100644
--- a/target/xtensa/defconfig
+++ b/target/xtensa/defconfig
@@ -77,7 +77,7 @@ BR2_GDB_VERSION="6.8"
#
# BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set
-BR2_LARGEFILE=y
+BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_INET_RPC=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 7a1905f..c989b05 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -81,7 +81,7 @@ config BR2_INSTALL_LIBGCJ
bool "Build/install java compiler and libgcj?"
depends on !BR2_avr32 && BR2_INSTALL_LIBSTDCPP
select BR2_GCC_CROSS_JAVA
- select BR2_LARGEFILE
+ select BR2_TOOLCHAIN_HAS_LARGEFILE
depends on BROKEN
help
Build/install java compiler and libgcj?
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index db7c7f1..fd587ce 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -142,7 +142,7 @@ check_glibc = \
echo "Incorrect selection of the C library"; \
exit -1; \
fi; \
- $(call check_glibc_feature,BR2_LARGEFILE,Large file support) ;\
+ $(call check_glibc_feature,BR2_TOOLCHAIN_HAS_LARGEFILE,Large file support) ;\
$(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) ;\
@@ -189,7 +189,7 @@ check_uclibc = \
fi; \
UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \
$(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\
- $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_TOOLCHAIN_HAS_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
$(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) ;\
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 3fd433a..ef786e5 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -6,7 +6,7 @@ comment "Toolchain Options"
config BR2_TOOLCHAIN_BUILDROOT_LARGEFILE
bool "Enable large file (files > 2 GB) support"
- select BR2_LARGEFILE
+ select BR2_TOOLCHAIN_HAS_LARGEFILE
help
Enable this option if you want your toolchain to support
files bigger than 2 GB.
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index a641785..31d017c 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -5,7 +5,7 @@
# so put it here instead
source "toolchain/gdb/Config.in"
-config BR2_LARGEFILE
+config BR2_TOOLCHAIN_HAS_LARGEFILE
bool
config BR2_INET_IPV6
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 1a10416..76222f4 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -12,7 +12,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc
# let's not deal with that for the time being, it's complex...
config BR2_TOOLCHAIN_CTNG_eglibc
bool "eglibc"
- select BR2_LARGEFILE
+ select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_INET_IPV6
select BR2_INET_RPC
select BR2_ENABLE_LOCALE
@@ -21,7 +21,7 @@ config BR2_TOOLCHAIN_CTNG_eglibc
config BR2_TOOLCHAIN_CTNG_glibc
bool "glibc"
- select BR2_LARGEFILE
+ select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_INET_IPV6
select BR2_INET_RPC
select BR2_ENABLE_LOCALE
@@ -51,7 +51,7 @@ comment "Toolchain Options"
config BR2_TOOLCHAIN_CTNG_uClibc_LARGEFILE
bool "Enable large file (files > 2 GB) support"
- select BR2_LARGEFILE
+ select BR2_TOOLCHAIN_HAS_LARGEFILE
help
Enable this option if you want your toolchain to support
files bigger than 2 GB.
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index edd643b..5dd3c57 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -279,7 +279,7 @@ CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_WCHAR)=.*:\# \1 is not set:;
endif
# Handle the LFS option
-ifneq ($(call qstrip,$(BR2_LARGEFILE)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_HAS_LARGEFILE)),)
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_LFS) is not set:\1=y:;
else
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_LFS)=.*:\# \1 is not set:;
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 2ed65bf..40318e3 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -143,7 +143,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
config BR2_TOOLCHAIN_EXTERNAL_GLIBC
bool
- select BR2_LARGEFILE
+ select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_INET_IPV6
select BR2_INET_RPC
select BR2_USE_WCHAR
@@ -174,7 +174,7 @@ if BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
config BR2_TOOLCHAIN_EXTERNAL_LARGEFILE
bool "Toolchain has large file support?"
- select BR2_LARGEFILE
+ select BR2_TOOLCHAIN_HAS_LARGEFILE
help
Select this option if your external toolchain supports
largefile. If you don't know, leave the default value,
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 19256bb..8422834 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -236,7 +236,7 @@ ifneq ($(UCLIBC_TARGET_ENDIAN),)
-e 's/.*\(ARCH_WANTS_$(UCLIBC_TARGET_ENDIAN)_ENDIAN\).*/\1=y/g' \
$(UCLIBC_DIR)/.oldconfig
endif
-ifeq ($(BR2_LARGEFILE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),y)
$(SED) 's,.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=y,g' $(UCLIBC_DIR)/.oldconfig
else
$(SED) 's,.*UCLIBC_HAS_LFS.*,UCLIBC_HAS_LFS=n,g' $(UCLIBC_DIR)/.oldconfig
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 2/9] Rename BR2_INET_IPV6 to BR2_TOOLCHAIN_HAS_IPV6
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 1/9] Rename BR2_LARGEFILE to BR2_TOOLCHAIN_HAS_LARGEFILE Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 3/9] Rename BR2_INET_RPC to BR2_TOOLCHAIN_HAS_RPC Thomas Petazzoni
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/arm_nptl_toolchain_defconfig | 2 +-
configs/arm_toolchain_defconfig | 2 +-
package/Makefile.in | 2 +-
package/bmon/Config.in | 4 ++--
package/busybox/busybox.mk | 2 +-
package/dnsmasq/dnsmasq.mk | 2 +-
package/hostapd/hostapd.mk | 2 +-
package/ipsec-tools/ipsec-tools.mk | 2 +-
package/iptables/iptables.mk | 2 +-
package/libsoup/libsoup.mk | 2 +-
package/lsof/lsof.mk | 2 +-
package/mtd/Config.in | 4 ++--
package/multimedia/ffmpeg/Config.in | 5 +++--
package/multimedia/gst-ffmpeg/Config.in | 5 +++--
package/multimedia/gst-plugins-good/Config.in | 4 ++--
package/multimedia/mplayer/mplayer.mk | 2 +-
package/netsnmp/netsnmp.mk | 2 +-
package/ntp/ntp.mk | 2 +-
package/olsr/Config.in | 4 ++--
package/pppd/pppd.mk | 2 +-
package/qt/qt.mk | 2 +-
package/quagga/Config.in | 4 ++--
package/radvd/Config.in | 2 +-
package/samba/samba.mk | 2 +-
package/spawn-fcgi/spawn-fcgi.mk | 2 +-
package/squid/Config.in | 4 ++--
toolchain/helpers.mk | 4 ++--
toolchain/toolchain-buildroot/Config.in.2 | 2 +-
toolchain/toolchain-common.in | 2 +-
toolchain/toolchain-crosstool-ng/Config.in | 6 +++---
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
toolchain/toolchain-external/Config.in | 4 ++--
toolchain/uClibc/uclibc.mk | 2 +-
33 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/configs/arm_nptl_toolchain_defconfig b/configs/arm_nptl_toolchain_defconfig
index 78dc557..62870c9 100644
--- a/configs/arm_nptl_toolchain_defconfig
+++ b/configs/arm_nptl_toolchain_defconfig
@@ -4,7 +4,7 @@ BR2_arm926t=y
# Toolchain options
BR2_TOOLCHAIN_HAS_LARGEFILE=y
-BR2_INET_IPV6=y
+BR2_TOOLCHAIN_HAS_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
BR2_USE_WCHAR=y
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 7fa51c2..4c7b96d 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -3,7 +3,7 @@ BR2_arm=y
# Common Toolchain Options
BR2_TOOLCHAIN_HAS_LARGEFILE=y
-BR2_INET_IPV6=y
+BR2_TOOLCHAIN_HAS_IPV6=y
BR2_INET_RPC=y
BR2_ENABLE_LOCALE=y
BR2_USE_WCHAR=y
diff --git a/package/Makefile.in b/package/Makefile.in
index 4aa52dc..92060bd 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -303,7 +303,7 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
DISABLE_DOCUMENTATION=--disable-gtk-doc
endif
-ifneq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
DISABLE_IPV6= --disable-ipv6
endif
diff --git a/package/bmon/Config.in b/package/bmon/Config.in
index 667788b..1eecc8a 100644
--- a/package/bmon/Config.in
+++ b/package/bmon/Config.in
@@ -1,9 +1,9 @@
config BR2_PACKAGE_BMON
bool "bmon"
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
select BR2_PACKAGE_NCURSES
help
Linux bandwidth monitor
comment "bmon requires a toolchain with IPv6 support"
- depends on !BR2_INET_IPV6
+ depends on !BR2_TOOLCHAIN_HAS_IPV6
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 6764427..7c6f28a 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -60,7 +60,7 @@ endef
endif
# If IPv6 is enabled then enable basic ifupdown support for it
-ifeq ($(BR2_INET_IPV6),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
define BUSYBOX_SET_IPV6
$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG))
$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 9347ee5..2c11dca 100644
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -10,7 +10,7 @@ DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)"
DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
DNSMASQ_MAKE_OPT += DESTDIR=$(TARGET_DIR)
-ifneq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
DNSMASQ_COPTS += -DNO_IPV6
endif
diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index 4c95066..24fc072 100644
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -45,7 +45,7 @@ define HOSTAPD_EAP_CONFIG
echo "CONFIG_EAP_SIM=y" >>$(HOSTAPD_CONFIG)
echo "CONFIG_RADIUS_SERVER=y" >>$(HOSTAPD_CONFIG)
endef
-ifeq ($(BR2_INET_IPV6),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
define HOSTAPD_RADIUS_IPV6_CONFIG
$(SED) "s/^#CONFIG_IPV6/CONFIG_IPV6/" $(HOSTAPD_CONFIG)
endef
diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk
index 0861a05..f989224 100644
--- a/package/ipsec-tools/ipsec-tools.mk
+++ b/package/ipsec-tools/ipsec-tools.mk
@@ -44,7 +44,7 @@ else
IPSEC_TOOLS_CONF_OPT+= --disable-stats
endif
-ifeq ($(BR2_INET_IPV6),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
IPSEC_TOOLS_CONF_OPT+= --enable-ipv6
else
IPSEC_TOOLS_CONF_OPT+= --disable-ipv6
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 8652de4..385e480 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -31,7 +31,7 @@ endef
IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_SYMLINK_CREATE
-ifeq ($(BR2_INET_IPV6),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_SYMLINK_CREATE
else
IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_REMOVE
diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 132ea34..e081bf7 100644
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -12,7 +12,7 @@ LIBSOUP_INSTALL_STAGING = YES
LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
-ifneq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
LIBSOUP_CONF_ENV += soup_cv_ipv6=no
endif
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 18783d0..854dbb3 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -11,7 +11,7 @@ BR2_LSOF_CFLAGS =
ifeq ($(BR2_TOOLCHAIN_HAS_LARGEFILE),)
BR2_LSOF_CFLAGS += -U_FILE_OFFSET_BITS
endif
-ifeq ($(BR2_INET_IPV6),)
+ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),)
BR2_LSOF_CFLAGS += -UHASIPv6
endif
diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index 692654c..bfcde4f 100644
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -79,11 +79,11 @@ config BR2_PACKAGE_MTD_NFTL_FORMAT
bool "nftl_format"
config BR2_PACKAGE_MTD_RECV_IMAGE
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
bool "recv_image"
comment "recv_image requires a toolchain with IPv6 support"
- depends on !BR2_INET_IPV6
+ depends on !BR2_TOOLCHAIN_HAS_IPV6
config BR2_PACKAGE_MTD_RFDDUMP
bool "rfddump"
diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in
index 901a6dd..f4cf3b7 100644
--- a/package/multimedia/ffmpeg/Config.in
+++ b/package/multimedia/ffmpeg/Config.in
@@ -1,10 +1,11 @@
comment "ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
- depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_INET_IPV6)
+ depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && \
+ BR2_TOOLCHAIN_HAS_IPV6)
menuconfig BR2_PACKAGE_FFMPEG
bool "ffmpeg"
depends on BR2_TOOLCHAIN_HAS_LARGEFILE
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
help
FFmpeg is a complete, cross-platform solution to record, convert
and stream audio and video.
diff --git a/package/multimedia/gst-ffmpeg/Config.in b/package/multimedia/gst-ffmpeg/Config.in
index c4f4681..f4f1557 100644
--- a/package/multimedia/gst-ffmpeg/Config.in
+++ b/package/multimedia/gst-ffmpeg/Config.in
@@ -7,11 +7,12 @@ config BR2_PACKAGE_GST_FFMPEG
select BR2_PACKAGE_FFMPEG_POSTPROC
select BR2_PACKAGE_FFMPEG_SWSCALE
depends on BR2_TOOLCHAIN_HAS_LARGEFILE
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
help
GStreamer plugin using FFmpeg.
http://gstreamer.freedesktop.org/
comment "gst-ffmpeg requires a toolchain with LARGEFILE and IPV6 support"
- depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_INET_IPV6)
+ depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && \
+ BR2_TOOLCHAIN_HAS_IPV6)
diff --git a/package/multimedia/gst-plugins-good/Config.in b/package/multimedia/gst-plugins-good/Config.in
index 368642f..1cac766 100644
--- a/package/multimedia/gst-plugins-good/Config.in
+++ b/package/multimedia/gst-plugins-good/Config.in
@@ -134,11 +134,11 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM
bool "spectrum"
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
bool "udp"
comment "udp requires a toolchain with IPv6 support"
- depends on !BR2_INET_IPV6
+ depends on !BR2_TOOLCHAIN_HAS_IPV6
config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX
bool "videobox"
diff --git a/package/multimedia/mplayer/mplayer.mk b/package/multimedia/mplayer/mplayer.mk
index ac51ece..389a84c 100644
--- a/package/multimedia/mplayer/mplayer.mk
+++ b/package/multimedia/mplayer/mplayer.mk
@@ -121,7 +121,7 @@ endef
# this is available on uClibc 0.9.31 even without ipv6 support, breaking the
# build in ffmpeg/libavformat/udp.c
-ifneq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
define MPLAYER_FIXUP_IPV6_MREQ_DETECTION
$(SED) 's/\(#define HAVE_STRUCT_IPV6_MREQ\) 1/\1 0/' $(@D)/config.h
endef
diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index e8d7788..6e06bad 100644
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -44,7 +44,7 @@ ifneq ($(BR2_HAVE_DOCUMENTATION),y)
endif
# Remove IPv6 MIBs if there's no IPv6
-ifneq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
define NETSNMP_REMOVE_MIBS_IPV6
rm -f $(TARGET_DIR)/usr/share/snmp/mibs/IPV6*
endef
diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index 72e462e..f3f948f 100644
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -9,7 +9,7 @@ NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2
NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no
-ifneq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
NTP_CONF_ENV += isc_cv_have_in6addr_any=no
endif
diff --git a/package/olsr/Config.in b/package/olsr/Config.in
index ada82b4..6193fad 100644
--- a/package/olsr/Config.in
+++ b/package/olsr/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_OLSR
bool "OLSR mesh networking Daemon"
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
help
The Optimized Link State Routing protocol (OLSR) is a
routing protocol that is optimised for mobile ad-hoc
@@ -12,4 +12,4 @@ config BR2_PACKAGE_OLSR
http://www.olsr.org/
comment "olsr requires a toolchain with IPv6 support"
- depends on !BR2_INET_IPV6
+ depends on !BR2_TOOLCHAIN_HAS_IPV6
diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index 05c1c32..82ea720 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -19,7 +19,7 @@ ifeq ($(BR2_PACKAGE_PPPD_FILTER),y)
PPPD_MAKE_OPT += FILTER=y
endif
-ifeq ($(BR2_INET_IPV6),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
PPPD_MAKE_OPT += HAVE_INET6=y
endif
diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index a4a1fc8..d098585 100644
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -495,7 +495,7 @@ $(QT_TARGET_DIR)/.unpacked: $(DL_DIR)/$(QT_SOURCE)
$(QT_TARGET_DIR)/.configured: $(QT_TARGET_DIR)/.unpacked
-[ -f $(QT_TARGET_DIR)/Makefile ] && $(MAKE) -C $(QT_TARGET_DIR) confclean
-ifneq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QT_TARGET_DIR)/configure
$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QT_TARGET_DIR)/configure
endif
diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 9ca2f98..75e96d4 100644
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -47,7 +47,7 @@ config BR2_PACKAGE_QUAGGA_OPAQUE_LSA
config BR2_PACKAGE_QUAGGA_OSPF6D
bool "OSPFv3 (IPv6) protocol"
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
help
Build ospf6d daemon.
@@ -58,7 +58,7 @@ config BR2_PACKAGE_QUAGGA_RIPD
config BR2_PACKAGE_QUAGGA_RIPNGD
bool "RIPng (IPv6) protocol"
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
help
Build ripngd daemon.
diff --git a/package/radvd/Config.in b/package/radvd/Config.in
index c7753f0..2eecb0e 100644
--- a/package/radvd/Config.in
+++ b/package/radvd/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_RADVD
bool "radvd"
select BR2_PACKAGE_FLEX
select BR2_PACKAGE_FLEX_LIBFL
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
help
IPv6 Router Advertisement Daemon.
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index f61444d..160cf2e 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -32,7 +32,7 @@ SAMBA_CONF_ENV = \
samba_cv_HAVE_SECURE_MKSTEMP=yes \
samba_cv_CC_NEGATIVE_ENUM_VALUES=yes \
samba_cv_fpie=no \
- libreplace_cv_HAVE_IPV6=$(if $(BR2_INET_IPV6),yes,no) \
+ libreplace_cv_HAVE_IPV6=$(if $(BR2_TOOLCHAIN_HAS_IPV6),yes,no) \
$(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread)
diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
index 5070f73..b08029a 100644
--- a/package/spawn-fcgi/spawn-fcgi.mk
+++ b/package/spawn-fcgi/spawn-fcgi.mk
@@ -8,7 +8,7 @@ SPAWN_FCGI_VERSION = 1.6.3
SPAWN_FCGI_SITE = http://www.lighttpd.net/download
SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2
-ifneq ($(BR2_INET_IPV6),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
SPAWN_FCGI_CONF_OPT = --disable-ipv6
endif
diff --git a/package/squid/Config.in b/package/squid/Config.in
index 4ec7fa4..5834ac9 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,10 +1,10 @@
comment "Squid requires a toolchain with C++ and IPv6 support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_IPV6
config BR2_PACKAGE_SQUID
bool "squid"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_INET_IPV6
+ depends on BR2_TOOLCHAIN_HAS_IPV6
select BR2_PACKAGE_LIBCAP
help
Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more.
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index fd587ce..10b2328 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -143,7 +143,7 @@ check_glibc = \
exit -1; \
fi; \
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_LARGEFILE,Large file support) ;\
- $(call check_glibc_feature,BR2_INET_IPV6,IPv6 support) ;\
+ $(call check_glibc_feature,BR2_TOOLCHAIN_HAS_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_MMU,MMU support) ;\
@@ -190,7 +190,7 @@ check_uclibc = \
UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \
$(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_TOOLCHAIN_HAS_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
- $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_TOOLCHAIN_HAS_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
$(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) ;\
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index ef786e5..6e2fcc6 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -13,7 +13,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LARGEFILE
config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
bool "Enable IPv6 support"
- select BR2_INET_IPV6
+ select BR2_TOOLCHAIN_HAS_IPV6
help
Enable this option if you want your toolchain to support
IPv6.
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 31d017c..c13776c 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -8,7 +8,7 @@ source "toolchain/gdb/Config.in"
config BR2_TOOLCHAIN_HAS_LARGEFILE
bool
-config BR2_INET_IPV6
+config BR2_TOOLCHAIN_HAS_IPV6
bool
config BR2_INET_RPC
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 76222f4..5e724e2 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -13,7 +13,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc
config BR2_TOOLCHAIN_CTNG_eglibc
bool "eglibc"
select BR2_TOOLCHAIN_HAS_LARGEFILE
- select BR2_INET_IPV6
+ select BR2_TOOLCHAIN_HAS_IPV6
select BR2_INET_RPC
select BR2_ENABLE_LOCALE
select BR2_USE_WCHAR
@@ -22,7 +22,7 @@ config BR2_TOOLCHAIN_CTNG_eglibc
config BR2_TOOLCHAIN_CTNG_glibc
bool "glibc"
select BR2_TOOLCHAIN_HAS_LARGEFILE
- select BR2_INET_IPV6
+ select BR2_TOOLCHAIN_HAS_IPV6
select BR2_INET_RPC
select BR2_ENABLE_LOCALE
select BR2_USE_WCHAR
@@ -58,7 +58,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc_LARGEFILE
config BR2_TOOLCHAIN_CTNG_uClibc_INET_IPV6
bool "Enable IPv6 support"
- select BR2_INET_IPV6
+ select BR2_TOOLCHAIN_HAS_IPV6
help
Enable this option if you want your toolchain to support
IPv6.
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 5dd3c57..c6469ee 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -286,7 +286,7 @@ CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_LFS)=.*:\# \1 is not set:;
endif
# Handle the IPv6 option
-ifneq ($(call qstrip,$(BR2_INET_IPV6)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_HAS_IPV6)),)
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_IPV6) is not set:\1=y:;
else
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_IPV6)=.*:\# \1 is not set:;
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 40318e3..2fe0bc3 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -144,7 +144,7 @@ config BR2_TOOLCHAIN_EXTERNAL_PREFIX
config BR2_TOOLCHAIN_EXTERNAL_GLIBC
bool
select BR2_TOOLCHAIN_HAS_LARGEFILE
- select BR2_INET_IPV6
+ select BR2_TOOLCHAIN_HAS_IPV6
select BR2_INET_RPC
select BR2_USE_WCHAR
select BR2_ENABLE_LOCALE
@@ -182,7 +182,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LARGEFILE
config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6
bool "Toolchain has IPv6 support?"
- select BR2_INET_IPV6
+ select BR2_TOOLCHAIN_HAS_IPV6
help
Select this option if your external toolchain supports
IPv6. If you don't know, leave the default value, Buildroot
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 8422834..a92bb58 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -243,7 +243,7 @@ else
$(SED) '/.*UCLIBC_HAS_FOPEN_LARGEFILE_MODE.*/d' $(UCLIBC_DIR)/.oldconfig
echo "# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set" >> $(UCLIBC_DIR)/.oldconfig
endif
-ifeq ($(BR2_INET_IPV6),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
$(SED) 's,^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,g' $(UCLIBC_DIR)/.oldconfig
else
$(SED) 's,^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=n,g' $(UCLIBC_DIR)/.oldconfig
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 3/9] Rename BR2_INET_RPC to BR2_TOOLCHAIN_HAS_RPC
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 1/9] Rename BR2_LARGEFILE to BR2_TOOLCHAIN_HAS_LARGEFILE Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 2/9] Rename BR2_INET_IPV6 to BR2_TOOLCHAIN_HAS_IPV6 Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 4/9] Rename BR2_USE_WCHAR to BR2_TOOLCHAIN_HAS_WCHAR Thomas Petazzoni
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/arm_nptl_toolchain_defconfig | 2 +-
configs/arm_toolchain_defconfig | 2 +-
package/busybox/busybox.mk | 2 +-
package/lmbench/Config.in | 4 ++--
package/lsof/Config.in | 4 ++--
package/netkitbase/Config.in | 4 ++--
package/netkittelnet/Config.in | 4 ++--
package/nfs-utils/Config.in | 4 ++--
package/portmap/Config.in | 4 ++--
package/util-linux/Config.in | 4 ++--
target/xtensa/defconfig | 2 +-
toolchain/helpers.mk | 4 ++--
toolchain/toolchain-buildroot/Config.in.2 | 2 +-
toolchain/toolchain-common.in | 2 +-
toolchain/toolchain-crosstool-ng/Config.in | 6 +++---
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
toolchain/toolchain-external/Config.in | 4 ++--
toolchain/toolchain-external/ext-tool.mk | 2 +-
toolchain/uClibc/uclibc.mk | 2 +-
19 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/configs/arm_nptl_toolchain_defconfig b/configs/arm_nptl_toolchain_defconfig
index 62870c9..d9cf6dc 100644
--- a/configs/arm_nptl_toolchain_defconfig
+++ b/configs/arm_nptl_toolchain_defconfig
@@ -5,7 +5,7 @@ BR2_arm926t=y
# Toolchain options
BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_TOOLCHAIN_HAS_IPV6=y
-BR2_INET_RPC=y
+BR2_TOOLCHAIN_HAS_RPC=y
BR2_ENABLE_LOCALE=y
BR2_USE_WCHAR=y
BR2_PTHREADS_NATIVE=y
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 4c7b96d..436a139 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -4,7 +4,7 @@ BR2_arm=y
# Common Toolchain Options
BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_TOOLCHAIN_HAS_IPV6=y
-BR2_INET_RPC=y
+BR2_TOOLCHAIN_HAS_RPC=y
BR2_ENABLE_LOCALE=y
BR2_USE_WCHAR=y
BR2_INSTALL_LIBSTDCPP=y
diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 7c6f28a..cf0ba34 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -73,7 +73,7 @@ endef
endif
# If RPC is enabled then enable nfs mounts
-ifeq ($(BR2_INET_RPC),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_RPC),y)
define BUSYBOX_SET_RPC
$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MOUNT_NFS,$(BUSYBOX_BUILD_CONFIG))
endef
diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in
index c8423d1..c2f5457 100644
--- a/package/lmbench/Config.in
+++ b/package/lmbench/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_LMBENCH
bool "lmbench"
# Uses pmap_set, pmap__unset, pmap_getport, etc.
- depends on BR2_INET_RPC
+ depends on BR2_TOOLCHAIN_HAS_RPC
help
LMbench is a suite of simple, portable,
ANSI/C microbenchmarks for UNIX/POSIX.
@@ -9,4 +9,4 @@ config BR2_PACKAGE_LMBENCH
http://sourceforge.net/projects/lmbench/
comment "lmbench requires a toolchain with RPC support"
- depends on !BR2_INET_RPC
+ depends on !BR2_TOOLCHAIN_HAS_RPC
diff --git a/package/lsof/Config.in b/package/lsof/Config.in
index 22b7f5e..a5e2b90 100644
--- a/package/lsof/Config.in
+++ b/package/lsof/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LSOF
bool "lsof"
- depends on BR2_INET_RPC
+ depends on BR2_TOOLCHAIN_HAS_RPC
help
lsof (LiSt Open Files)
The lsof tool lists information about files opened by
@@ -9,4 +9,4 @@ config BR2_PACKAGE_LSOF
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/
comment "lsof requires a toolchain with RPC support"
- depends on !BR2_INET_RPC
+ depends on !BR2_TOOLCHAIN_HAS_RPC
diff --git a/package/netkitbase/Config.in b/package/netkitbase/Config.in
index 725e500..c51bd27 100644
--- a/package/netkitbase/Config.in
+++ b/package/netkitbase/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_NETKITBASE
bool "netkitbase"
- depends on BR2_INET_RPC
+ depends on BR2_TOOLCHAIN_HAS_RPC
help
Old-style inetd.
ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
comment "netkitbase requires a toolchain with RPC support"
- depends on !BR2_INET_RPC
+ depends on !BR2_TOOLCHAIN_HAS_RPC
diff --git a/package/netkittelnet/Config.in b/package/netkittelnet/Config.in
index 058d210..09e5ae4 100644
--- a/package/netkittelnet/Config.in
+++ b/package/netkittelnet/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_NETKITTELNET
bool "netkittelnet"
- depends on BR2_INET_RPC
+ depends on BR2_TOOLCHAIN_HAS_RPC
select BR2_PACKAGE_NETKITBASE
help
Standard Linux telnet client and server.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_NETKITTELNET
ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/
comment "netkittelnet requires a toolchain with RPC support"
- depends on !BR2_INET_RPC
+ depends on !BR2_TOOLCHAIN_HAS_RPC
diff --git a/package/nfs-utils/Config.in b/package/nfs-utils/Config.in
index e7b0566..ac3eb0c 100644
--- a/package/nfs-utils/Config.in
+++ b/package/nfs-utils/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_NFS_UTILS
bool "nfs-utils"
- depends on BR2_INET_RPC
+ depends on BR2_TOOLCHAIN_HAS_RPC
depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
The NFS Linux kernel server.
@@ -10,7 +10,7 @@ config BR2_PACKAGE_NFS_UTILS
http://sourceforge.net/projects/nfs
comment "nfs-utils requires a toolchain with RPC and LARGEFILE support"
- depends on !BR2_INET_RPC || !BR2_TOOLCHAIN_HAS_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_RPC || !BR2_TOOLCHAIN_HAS_LARGEFILE
menu "NFS utilities selection"
depends on BR2_PACKAGE_NFS_UTILS
diff --git a/package/portmap/Config.in b/package/portmap/Config.in
index 1f22ab6..4d55a97 100644
--- a/package/portmap/Config.in
+++ b/package/portmap/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_PORTMAP
bool "portmap"
- depends on BR2_INET_RPC
+ depends on BR2_TOOLCHAIN_HAS_RPC
help
The standard portmapper for RPC services.
http://neil.brown.name/portmap/
comment "portmap requires a toolchain with 'Enable RPC' selected"
- depends on !BR2_INET_RPC
+ depends on !BR2_TOOLCHAIN_HAS_RPC
diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in
index 434dae9..f188fb1 100644
--- a/package/util-linux/Config.in
+++ b/package/util-linux/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_UTIL-LINUX
bool "util-linux"
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
- depends on BR2_INET_RPC
+ depends on BR2_TOOLCHAIN_HAS_RPC
help
Various useful/essential Linux utilities.
@@ -11,4 +11,4 @@ config BR2_PACKAGE_UTIL-LINUX
http://www.kernel.org/pub/linux/utils/util-linux/
comment "util-linux requires a toolchain with RPC support"
- depends on !BR2_INET_RPC
+ depends on !BR2_TOOLCHAIN_HAS_RPC
diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig
index 63ec81f..b03aedc 100644
--- a/target/xtensa/defconfig
+++ b/target/xtensa/defconfig
@@ -78,7 +78,7 @@ BR2_GDB_VERSION="6.8"
# BR2_PACKAGE_SSTRIP_TARGET is not set
# BR2_PACKAGE_SSTRIP_HOST is not set
BR2_TOOLCHAIN_HAS_LARGEFILE=y
-BR2_INET_RPC=y
+BR2_TOOLCHAIN_HAS_RPC=y
BR2_TARGET_OPTIMIZATION="-Os -pipe"
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 10b2328..6ffbc8f 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -144,7 +144,7 @@ check_glibc = \
fi; \
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_LARGEFILE,Large file support) ;\
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_IPV6,IPv6 support) ;\
- $(call check_glibc_feature,BR2_INET_RPC,RPC support) ;\
+ $(call check_glibc_feature,BR2_TOOLCHAIN_HAS_RPC,RPC support) ;\
$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
$(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\
@@ -191,7 +191,7 @@ check_uclibc = \
$(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_TOOLCHAIN_HAS_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_TOOLCHAIN_HAS_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
- $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_INET_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_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) ;\
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 6e2fcc6..1ade855 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -20,7 +20,7 @@ config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
bool "Enable RPC support"
- select BR2_INET_RPC
+ select BR2_TOOLCHAIN_HAS_RPC
help
Enable this option if you want your toolchain to support
RPC (needed for NFS, for example).
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index c13776c..dfaa8c3 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -11,7 +11,7 @@ config BR2_TOOLCHAIN_HAS_LARGEFILE
config BR2_TOOLCHAIN_HAS_IPV6
bool
-config BR2_INET_RPC
+config BR2_TOOLCHAIN_HAS_RPC
bool
config BR2_USE_WCHAR
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 5e724e2..530b2a4 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -14,7 +14,7 @@ config BR2_TOOLCHAIN_CTNG_eglibc
bool "eglibc"
select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_TOOLCHAIN_HAS_IPV6
- select BR2_INET_RPC
+ select BR2_TOOLCHAIN_HAS_RPC
select BR2_ENABLE_LOCALE
select BR2_USE_WCHAR
select BR2_PROGRAM_INVOCATION
@@ -23,7 +23,7 @@ config BR2_TOOLCHAIN_CTNG_glibc
bool "glibc"
select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_TOOLCHAIN_HAS_IPV6
- select BR2_INET_RPC
+ select BR2_TOOLCHAIN_HAS_RPC
select BR2_ENABLE_LOCALE
select BR2_USE_WCHAR
select BR2_PROGRAM_INVOCATION
@@ -65,7 +65,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc_INET_IPV6
config BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC
bool "Enable RPC support"
- select BR2_INET_RPC
+ select BR2_TOOLCHAIN_HAS_RPC
help
Enable this option if you want your toolchain to support
RPC (needed for NFS, for example).
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index c6469ee..0215287 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -293,7 +293,7 @@ CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_IPV6)=.*:\# \1 is not set:;
endif
# Handle the RPC option
-ifneq ($(call qstrip,$(BR2_INET_RPC)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_HAS_RPC)),)
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_RPC) is not set:\1=y\nUCLIBC_HAS_FULL_RPC=y\nUCLIBC_HAS_REENTRANT_RPC=y:;
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_FULL_RPC) is not set:\1=y:;
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_REENTRANT_RPC) is not set:\1=y:;
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 2fe0bc3..09115fb 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -145,7 +145,7 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
bool
select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_TOOLCHAIN_HAS_IPV6
- select BR2_INET_RPC
+ select BR2_TOOLCHAIN_HAS_RPC
select BR2_USE_WCHAR
select BR2_ENABLE_LOCALE
select BR2_PROGRAM_INVOCATION
@@ -190,7 +190,7 @@ config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6
config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
bool "Toolchain has RPC support ?"
- select BR2_INET_RPC
+ select BR2_TOOLCHAIN_HAS_RPC
help
Select this option if your external toolchain supports
RPC. If you don't know, leave the default value, Buildroot
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index f6249ef..e589738 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -25,7 +25,7 @@
# the Buildroot configuration system knows whether the toolchain
# supports RPC, IPv6, locales, large files, etc. Unfortunately, these
# things cannot be detected automatically, since the value of these
-# options (such as BR2_INET_RPC) are needed at configuration time
+# options (such as BR2_TOOLCHAIN_HAS_RPC) are needed at configuration time
# because these options are used as dependencies for other
# options. And at configuration time, we are not able to retrieve the
# external toolchain configuration.
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index a92bb58..692d43c 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -248,7 +248,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
else
$(SED) 's,^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=n,g' $(UCLIBC_DIR)/.oldconfig
endif
-ifeq ($(BR2_INET_RPC),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_RPC),y)
$(SED) 's,^.*UCLIBC_HAS_RPC.*,UCLIBC_HAS_RPC=y,g' \
-e 's,^.*UCLIBC_HAS_FULL_RPC.*,UCLIBC_HAS_FULL_RPC=y,g' \
-e 's,^.*UCLIBC_HAS_REENTRANT_RPC.*,UCLIBC_HAS_REENTRANT_RPC=y,g' \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 4/9] Rename BR2_USE_WCHAR to BR2_TOOLCHAIN_HAS_WCHAR
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
` (2 preceding siblings ...)
2011-03-07 22:28 ` [Buildroot] [PATCH 3/9] Rename BR2_INET_RPC to BR2_TOOLCHAIN_HAS_RPC Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 5/9] Rename BR2_ENABLE_LOCALE_{PURGE, WHITELIST} to BR2_LOCALE_{PURGE, WHITELIST} Thomas Petazzoni
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/arm_nptl_toolchain_defconfig | 2 +-
configs/arm_toolchain_defconfig | 2 +-
package/atk/Config.in | 4 ++--
package/bison/Config.in | 4 ++--
package/coreutils/Config.in | 4 ++--
package/cvs/Config.in | 2 +-
package/dbus-glib/Config.in | 4 ++--
package/dbus-python/Config.in | 4 ++--
package/dnsmasq/Config.in | 2 +-
package/docker/Config.in | 4 ++--
package/enchant/Config.in | 4 ++--
package/findutils/Config.in | 4 ++--
package/gamin/Config.in | 4 ++--
package/gawk/Config.in | 2 +-
package/gdk-pixbuf/Config.in | 2 +-
package/gettext/Config.in | 6 +++---
package/gmpc/Config.in | 4 ++--
package/gob2/Config.in | 4 ++--
package/grep/Config.in | 4 ++--
package/gvfs/Config.in | 4 ++--
package/hal/Config.in | 4 ++--
package/icu/Config.in | 4 ++--
package/libarchive/Config.in | 4 ++--
package/libglade/Config.in | 4 ++--
package/libglib2/Config.in | 4 ++--
package/libglib2/libglib2.mk | 2 +-
package/libgtk2/Config.in | 4 ++--
package/librsvg/Config.in | 2 +-
package/libsoup/Config.in | 4 ++--
package/logrotate/Config.in | 4 ++--
package/lsof/lsof.mk | 2 +-
package/m4/Config.in | 4 ++--
package/m4/m4.mk | 2 +-
package/midori/Config.in | 4 ++--
package/multimedia/alsa-utils/Config.in | 4 ++--
package/multimedia/gstreamer/Config.in | 4 ++--
package/multimedia/libmms/Config.in | 4 ++--
package/multimedia/libmpd/Config.in | 4 ++--
package/multimedia/mpd/Config.in | 4 ++--
package/multimedia/swfdec/Config.in | 4 ++--
package/mutt/Config.in | 4 ++--
package/nbd/Config.in | 4 ++--
package/ntfs-3g/Config.in | 4 ++--
package/ntfsprogs/Config.in | 4 ++--
package/pango/Config.in | 4 ++--
package/patch/Config.in | 4 ++--
package/pcmanfm/Config.in | 4 ++--
package/php/Config.ext | 4 ++--
package/pkg-config/Config.in | 4 ++--
package/python/Config.in | 4 ++--
package/rrdtool/Config.in | 4 ++--
package/ruby/Config.in | 4 ++--
package/sed/Config.in | 2 +-
package/shared-mime-info/Config.in | 4 ++--
package/sshfs/Config.in | 4 ++--
package/synergy/Config.in | 4 ++--
package/tar/Config.in | 4 ++--
package/webkit/Config.in | 4 ++--
package/wget/Config.in | 4 ++--
package/x11r7/Config.in | 4 ++--
package/xerces/Config.in | 5 +++--
toolchain/gdb/Config.in | 4 ++--
toolchain/helpers.mk | 4 ++--
toolchain/toolchain-buildroot/Config.in.2 | 2 +-
toolchain/toolchain-common.in | 2 +-
toolchain/toolchain-crosstool-ng/Config.in | 6 +++---
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
toolchain/toolchain-external/Config.in | 4 ++--
toolchain/uClibc/uclibc.mk | 2 +-
69 files changed, 126 insertions(+), 125 deletions(-)
diff --git a/configs/arm_nptl_toolchain_defconfig b/configs/arm_nptl_toolchain_defconfig
index d9cf6dc..aa043da 100644
--- a/configs/arm_nptl_toolchain_defconfig
+++ b/configs/arm_nptl_toolchain_defconfig
@@ -7,7 +7,7 @@ BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_TOOLCHAIN_HAS_IPV6=y
BR2_TOOLCHAIN_HAS_RPC=y
BR2_ENABLE_LOCALE=y
-BR2_USE_WCHAR=y
+BR2_TOOLCHAIN_HAS_WCHAR=y
BR2_PTHREADS_NATIVE=y
BR2_INSTALL_LIBSTDCPP=y
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 436a139..9773d74 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -6,7 +6,7 @@ BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_TOOLCHAIN_HAS_IPV6=y
BR2_TOOLCHAIN_HAS_RPC=y
BR2_ENABLE_LOCALE=y
-BR2_USE_WCHAR=y
+BR2_TOOLCHAIN_HAS_WCHAR=y
BR2_INSTALL_LIBSTDCPP=y
# No package
diff --git a/package/atk/Config.in b/package/atk/Config.in
index 928fae7..d6e0a75 100644
--- a/package/atk/Config.in
+++ b/package/atk/Config.in
@@ -1,9 +1,9 @@
config BR2_PACKAGE_ATK
bool "atk"
select BR2_PACKAGE_LIBGLIB2
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
help
The ATK accessibility toolkit, needed to build GTK+-2.x.
comment "atk requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/bison/Config.in b/package/bison/Config.in
index e8aa0b6..db72990 100644
--- a/package/bison/Config.in
+++ b/package/bison/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_BISON
bool "bison"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
General-purpose parser generator that converts a
grammar description for an LALR context-free grammar into a C
@@ -9,4 +9,4 @@ config BR2_PACKAGE_BISON
http://www.gnu.org/software/bison/
comment "bison requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/coreutils/Config.in b/package/coreutils/Config.in
index a7159cf..d72df3a 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_TOOLCHAIN_HAS_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_PROGRAM_INVOCATION)
+ depends on !(BR2_TOOLCHAIN_HAS_WCHAR && BR2_PROGRAM_INVOCATION)
diff --git a/package/cvs/Config.in b/package/cvs/Config.in
index 2e61834..3952ade 100644
--- a/package/cvs/Config.in
+++ b/package/cvs/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_CVS
bool "cvs"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_NCURSES
help
Concurrent Versions System - source code revision control tools.
diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in
index c019be7..5e925c5 100644
--- a/package/dbus-glib/Config.in
+++ b/package/dbus-glib/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_DBUS_GLIB
bool "dbus-glib"
depends on BR2_PACKAGE_DBUS
depends on BR2_DBUS_EXPAT
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
GLib bindings for D-Bus.
@@ -13,4 +13,4 @@ comment "dbus-glib needs dbus to be compiled with expat support"
depends on BR2_PACKAGE_DBUS && !BR2_DBUS_EXPAT
comment "dbus-glib requires a toolchain with WCHAR support"
- depends on BR2_PACKAGE_DBUS && !BR2_USE_WCHAR
+ depends on BR2_PACKAGE_DBUS && !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index 91c127d..88ab335 100644
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_DBUS_PYTHON
bool "dbus-python"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
depends on BR2_PACKAGE_DBUS
depends on BR2_PACKAGE_PYTHON
select BR2_PACKAGE_DBUS_GLIB
@@ -10,4 +10,4 @@ config BR2_PACKAGE_DBUS_PYTHON
http://dbus.freedesktop.org/doc/dbus-python/
comment "dbus-python requires a toolchain with WCHAR support"
- depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && !BR2_USE_WCHAR
+ depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/dnsmasq/Config.in b/package/dnsmasq/Config.in
index e9c4870..4ae7914 100644
--- a/package/dnsmasq/Config.in
+++ b/package/dnsmasq/Config.in
@@ -23,7 +23,7 @@ config BR2_PACKAGE_DNSMASQ_DHCP
config BR2_PACKAGE_DNSMASQ_IDN
bool "IDN support (BIG!)"
depends on BR2_PACKAGE_DNSMASQ
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_LIBINTL
select BR2_PACKAGE_LIBIDN
help
diff --git a/package/docker/Config.in b/package/docker/Config.in
index 75bf5be..59af5c6 100644
--- a/package/docker/Config.in
+++ b/package/docker/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_DOCKER
bool "docker"
depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
a system tray dock for X
@@ -9,4 +9,4 @@ config BR2_PACKAGE_DOCKER
http://icculus.org/openbox/2/docker
comment "docker requires a toolchain with WCHAR support"
- depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR
+ depends on BR2_PACKAGE_XORG7 && !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/enchant/Config.in b/package/enchant/Config.in
index 33f36db..4451e0a 100644
--- a/package/enchant/Config.in
+++ b/package/enchant/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_ENCHANT
bool "enchant"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
Enchant is a spell-checking library that provides a consistent
@@ -10,4 +10,4 @@ config BR2_PACKAGE_ENCHANT
http://www.abisource.com/projects/enchant/
comment "enchant requires a toolchain with C++ and WCHAR support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/findutils/Config.in b/package/findutils/Config.in
index bbe2cc1..e2d7dc7 100644
--- a/package/findutils/Config.in
+++ b/package/findutils/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_FINDUTILS
bool "findutils"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Basic directory searching utilities. Provides the
common 'find', 'xargs', 'locate', and 'updatedb' binaries.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_FINDUTILS
http://www.gnu.org/software/findutils/findutils.html
comment "findutils requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/gamin/Config.in b/package/gamin/Config.in
index 3ede2e4..c4e2631 100644
--- a/package/gamin/Config.in
+++ b/package/gamin/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GAMIN
bool "gamin"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
the File Alteration Monitor
@@ -8,4 +8,4 @@ config BR2_PACKAGE_GAMIN
http://www.gnome.org/~veillard/gamin/sources
comment "gamin requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/gawk/Config.in b/package/gawk/Config.in
index 62ca860..4396d28 100644
--- a/package/gawk/Config.in
+++ b/package/gawk/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GAWK
bool "gawk"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
A special-purpose programming language which is data driven
rather than procedural. Allows for simple data-reformatting jobs
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 8b9cc3f..3e96844 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GDK_PIXBUF
bool "gdk-pixbuf"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
diff --git a/package/gettext/Config.in b/package/gettext/Config.in
index fabfe1e..a2e45db 100644
--- a/package/gettext/Config.in
+++ b/package/gettext/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_GETTEXT
bool "gettext"
depends on BR2_NEEDS_GETTEXT
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
The GNU `gettext' utilities are a set of tools that provide a
framework to help other GNU packages produce multi-lingual
@@ -10,7 +10,7 @@ config BR2_PACKAGE_GETTEXT
http://www.gnu.org/software/gettext/
comment "gettext requires a toolchain with WCHAR support"
- depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR
+ depends on BR2_NEEDS_GETTEXT && !BR2_TOOLCHAIN_HAS_WCHAR
config BR2_PACKAGE_GETTEXT_STATIC
bool "Use libgettext.a instead of libgettext.so.*"
@@ -27,7 +27,7 @@ config BR2_PACKAGE_GETTEXT_STATIC
config BR2_PACKAGE_LIBINTL
bool "libintl"
depends on BR2_NEEDS_GETTEXT
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Selecting this package installs all of gettext in the staging
directory and the shared library for it's use in the target.
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 7bfe611..23280af 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_GMPC
bool "gmpc"
depends on BR2_PACKAGE_LIBGTK2
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
@@ -17,4 +17,4 @@ config BR2_PACKAGE_GMPC
http://gmpcwiki.sarine.nl/index.php?title=GMPC
comment "gmpc requires a toolchain with WCHAR support"
- depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR
+ depends on BR2_PACKAGE_LIBGTK2 && !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/gob2/Config.in b/package/gob2/Config.in
index 562ac31..f4cb19f 100644
--- a/package/gob2/Config.in
+++ b/package/gob2/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GOB2
bool "gob2"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_FLEX
select BR2_PACKAGE_FLEX_LIBFL
@@ -12,4 +12,4 @@ config BR2_PACKAGE_GOB2
http://www.jirka.org/gob.html
comment "gob2 requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/grep/Config.in b/package/grep/Config.in
index 1b39922..dd4a39d 100644
--- a/package/grep/Config.in
+++ b/package/grep/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GREP
bool "grep"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
help
@@ -9,4 +9,4 @@ config BR2_PACKAGE_GREP
http://www.gnu.org/software/grep/grep.html
comment "grep needs a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in
index 22c93ef..0038855 100644
--- a/package/gvfs/Config.in
+++ b/package/gvfs/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_GVFS
bool "gvfs"
depends on BR2_TOOLCHAIN_HAS_LARGEFILE
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_EXPAT # needed by dbus(-glib)
select BR2_PACKAGE_DBUS
@@ -17,4 +17,4 @@ config BR2_PACKAGE_GVFS
http://en.wikipedia.org/wiki/GVFS
comment "gvfs requires a toolchain with LARGEFILE and WCHAR support"
- depends on !BR2_TOOLCHAIN_HAS_LARGEFILE || !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE || !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/hal/Config.in b/package/hal/Config.in
index 1951c9d..1117294 100644
--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_HAL
bool "hal"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
@@ -16,4 +16,4 @@ config BR2_PACKAGE_HAL
The Hardware Abstraction Layer (HAL) suite.
comment "hal requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/icu/Config.in b/package/icu/Config.in
index 21f5c2f..e593f85 100644
--- a/package/icu/Config.in
+++ b/package/icu/Config.in
@@ -1,11 +1,11 @@
config BR2_PACKAGE_ICU
bool "icu"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
International Components for Unicode.
http://site.icu-project.org/
comment "icu requires a toolchain with C++ support and WCHAR enabled"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/libarchive/Config.in b/package/libarchive/Config.in
index 38928b0..ba07269 100644
--- a/package/libarchive/Config.in
+++ b/package/libarchive/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBARCHIVE
bool "libarchive"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Libarchive is a reusable C library for reading and writing a
variety of streaming archive formats.
@@ -8,7 +8,7 @@ config BR2_PACKAGE_LIBARCHIVE
http://code.google.com/p/libarchive/
comment "libarchive requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
config BR2_PACKAGE_LIBARCHIVE_BSDTAR
bool "bsdtar"
diff --git a/package/libglade/Config.in b/package/libglade/Config.in
index f7a9a1c..2cb4c7b 100644
--- a/package/libglade/Config.in
+++ b/package/libglade/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_LIBGLADE
bool "libglade"
depends on BR2_PACKAGE_LIBGTK2
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_ATK
select BR2_PACKAGE_LIBXML2
@@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBGLADE
http://ftp.gnome.org/pub/GNOME/sources/libglade/
comment "libglade requires a toolchain with WCHAR support"
- depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR
+ depends on BR2_PACKAGE_LIBGTK2 && !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 3d42430..9bd3410 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -4,11 +4,11 @@ config BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_ZLIB
- depends on BR2_USE_WCHAR # gettext
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # gettext
help
Low-level core library that forms the basis of GTK+ and GNOME.
http://www.gtk.org/
comment "libglib2 requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 57facfc..09e3691 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -42,7 +42,7 @@ LIBGLIB2_CONF_ENV = \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal ac_cv_prog_F77=no \
ac_cv_func_posix_getgrgid_r=no \
- gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no)
+ gt_cv_c_wchar_t=$(if $(BR2_TOOLCHAIN_HAS_WCHAR),yes,no)
LIBGLIB2_CONF_OPT = --enable-shared \
--enable-static
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 38b0b47..4aca9c7 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_PANGO
select BR2_PACKAGE_GDK_PIXBUF
depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
depends on BR2_INSTALL_LIBSTDCPP # pango
help
The GTK+ version 2 graphical user interface library
@@ -17,4 +17,4 @@ config BR2_PACKAGE_LIBGTK2
http://www.gtk.org/
comment "libgtk2 requires a toolchain with WCHAR and C++ support"
- depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/librsvg/Config.in b/package/librsvg/Config.in
index fdb7d31..3e1d150 100644
--- a/package/librsvg/Config.in
+++ b/package/librsvg/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_LIBRSVG
select BR2_PACKAGE_PANGO
select BR2_PACKAGE_LIBGLIB2
depends on BR2_PACKAGE_LIBGTK2
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
help
The rsvg library is an efficient renderer for Scalable
Vector Graphics (SVG) pictures.
diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in
index 2264b63..74fd9bb 100644
--- a/package/libsoup/Config.in
+++ b/package/libsoup/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBSOUP
bool "libsoup"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
@@ -13,4 +13,4 @@ config BR2_PACKAGE_LIBSOUP
http://live.gnome.org/LibSoup
comment "libsoup requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/logrotate/Config.in b/package/logrotate/Config.in
index 0d0ec61..b270451 100644
--- a/package/logrotate/Config.in
+++ b/package/logrotate/Config.in
@@ -1,12 +1,12 @@
config BR2_PACKAGE_LOGROTATE
bool "logrotate"
select BR2_PACKAGE_POPT
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
A simple program to rotate logs.
https://fedorahosted.org/logrotate/
comment "logrotate requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 854dbb3..745c89c 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -15,7 +15,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_IPV6),)
BR2_LSOF_CFLAGS += -UHASIPv6
endif
-ifeq ($(BR2_USE_WCHAR),)
+ifeq ($(BR2_TOOLCHAIN_HAS_WCHAR),)
define LSOF_CONFIGURE_WCHAR_FIXUPS
$(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \
$(@D)/machine.h
diff --git a/package/m4/Config.in b/package/m4/Config.in
index 56b2859..d08edc9 100644
--- a/package/m4/Config.in
+++ b/package/m4/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_M4
bool "m4"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
An implementation of the traditional Unix macro processor.
http://www.gnu.org/software/m4/m4.html
comment "m4 requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index d713b6d..44740c7 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -9,7 +9,7 @@ M4_SITE = $(BR2_GNU_MIRROR)/m4
M4_CONF_ENV = gl_cv_func_gettimeofday_clobber=no
-ifneq ($(BR2_USE_WCHAR),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_WCHAR),y)
M4_CONF_ENV += gt_cv_c_wchar_t=no gl_cv_absolute_wchar_h=__fpending.h
endif
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 95a0afb..30dbde3 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -4,11 +4,11 @@ config BR2_PACKAGE_MIDORI
select BR2_PACKAGE_LIBSEXY
depends on BR2_PACKAGE_LIBGTK2
depends on BR2_INSTALL_LIBSTDCPP # webkit
- depends on BR2_USE_WCHAR # webkit
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # webkit
help
Midori is a lightweight web browser based on WebKit
http://software.twotoasts.de/?page=midori
comment "midori requires C++, WCHAR in toolchain and libgtk2"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_PACKAGE_LIBGTK2
diff --git a/package/multimedia/alsa-utils/Config.in b/package/multimedia/alsa-utils/Config.in
index b268606..572f986 100644
--- a/package/multimedia/alsa-utils/Config.in
+++ b/package/multimedia/alsa-utils/Config.in
@@ -27,11 +27,11 @@ config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER
select BR2_PACKAGE_NCURSES_TARGET_PANEL
select BR2_PACKAGE_NCURSES_TARGET_FORM
select BR2_PACKAGE_NCURSES_TARGET_MENU
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
default y
comment "alsamixer requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
config BR2_PACKAGE_ALSA_UTILS_AMIDI
bool "amidi"
diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in
index 7de904c..6c77aa7 100644
--- a/package/multimedia/gstreamer/Config.in
+++ b/package/multimedia/gstreamer/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GSTREAMER
bool "gstreamer"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
GStreamer is an open source multimedia framework.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_GSTREAMER
http://gstreamer.freedesktop.org/
comment "gstreamer requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/multimedia/libmms/Config.in b/package/multimedia/libmms/Config.in
index 17cb406..96577b6 100644
--- a/package/multimedia/libmms/Config.in
+++ b/package/multimedia/libmms/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBMMS
bool "libmms"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
LibMMS is a common library for parsing mms:// and mmsh://
@@ -12,4 +12,4 @@ config BR2_PACKAGE_LIBMMS
http://launchpad.net/libmms
comment "libmms requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/multimedia/libmpd/Config.in b/package/multimedia/libmpd/Config.in
index 9259c19..3652896 100644
--- a/package/multimedia/libmpd/Config.in
+++ b/package/multimedia/libmpd/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBMPD
bool "libmpd"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
@@ -11,4 +11,4 @@ config BR2_PACKAGE_LIBMPD
http://gmpcwiki.sarine.nl/index.php?title=Libmpd
comment "libmpd requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 66fc2e4..3efb7c0 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -1,7 +1,7 @@
menuconfig BR2_PACKAGE_MPD
bool "mpd"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
@@ -161,4 +161,4 @@ config BR2_PACKAGE_MPD_WAVPACK
endif
comment "mpd requires a toolchain with C++ and WCHAR support"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/multimedia/swfdec/Config.in b/package/multimedia/swfdec/Config.in
index bc1c73a..77fc919 100644
--- a/package/multimedia/swfdec/Config.in
+++ b/package/multimedia/swfdec/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_SWFDEC
bool "swfdec"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
depends on BR2_INSTALL_LIBSTDCPP # pango
select BR2_PACKAGE_LIBOIL
select BR2_PACKAGE_ALSA_LIB
@@ -32,4 +32,4 @@ config BR2_PACKAGE_SWFDEC_GSTREAMER
Enables GStreamer support
comment "swfdec requires a toolchain with WCHAR and C++ support"
- depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/mutt/Config.in b/package/mutt/Config.in
index 754979a..452cce0 100644
--- a/package/mutt/Config.in
+++ b/package/mutt/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_MUTT
bool "mutt"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_NCURSES
help
Mutt is a sophisticated text-based Mail User Agent (MUA)
@@ -8,4 +8,4 @@ config BR2_PACKAGE_MUTT
http://www.mutt.org/
comment "mutt requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/nbd/Config.in b/package/nbd/Config.in
index 6e92f93..f1f9004 100644
--- a/package/nbd/Config.in
+++ b/package/nbd/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_NBD
bool "nbd"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
NBD is a set of utilities to configure network block devices,
@@ -11,7 +11,7 @@ config BR2_PACKAGE_NBD
http://nbd.sf.net/
comment "nbd requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
if BR2_PACKAGE_NBD
diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in
index e1e3f0d..ea94de2 100644
--- a/package/ntfs-3g/Config.in
+++ b/package/ntfs-3g/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_NTFS_3G
bool "ntfs-3g"
depends on BR2_TOOLCHAIN_HAS_LARGEFILE
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
The NTFS-3G driver is an open source, freely available
read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD,
@@ -13,4 +13,4 @@ config BR2_PACKAGE_NTFS_3G
http://www.ntfs-3g.org/
comment "ntfs-3g requires a toolchain with LARGEFILE and WCHAR support"
- depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_USE_WCHAR)
+ depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_TOOLCHAIN_HAS_WCHAR)
diff --git a/package/ntfsprogs/Config.in b/package/ntfsprogs/Config.in
index d09987a..7e20d6d 100644
--- a/package/ntfsprogs/Config.in
+++ b/package/ntfsprogs/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_NTFSPROGS
bool "ntfsprogs"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
depends on BR2_TOOLCHAIN_HAS_LARGEFILE
help
wide collection of NTFS utilities
@@ -8,4 +8,4 @@ config BR2_PACKAGE_NTFSPROGS
http://www.linux-ntfs.org/
comment "ntfsprogs requires a toolchain with WCHAR and LARGEFILE support"
- depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_LARGEFILE
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_TOOLCHAIN_HAS_LARGEFILE
diff --git a/package/pango/Config.in b/package/pango/Config.in
index 923c3d4..f852e00 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_PANGO
bool "pango"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
depends on BR2_INSTALL_LIBSTDCPP # freetype support
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_EXPAT
@@ -17,4 +17,4 @@ config BR2_PACKAGE_PANGO
http://www.pango.org/
comment "pango requires a toolchain with WCHAR and C++ support"
- depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_INSTALL_LIBSTDCPP
diff --git a/package/patch/Config.in b/package/patch/Config.in
index dd6d51c..4b8d276 100644
--- a/package/patch/Config.in
+++ b/package/patch/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_PATCH
bool "patch"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Take patch files (containing difference listings) and apply them
to original files, producing patched versions.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_PATCH
http://www.gnu.org/software/patch/
comment "patch needs a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in
index c8b4deb..71a1adf 100644
--- a/package/pcmanfm/Config.in
+++ b/package/pcmanfm/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_PCMANFM
bool "pcmanfm"
depends on BR2_PACKAGE_XORG7
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_GAMIN
select BR2_PACKAGE_STARTUP_NOTIFICATION
depends on BR2_PACKAGE_LIBGTK2
@@ -12,4 +12,4 @@ config BR2_PACKAGE_PCMANFM
http://internap.dl.sourceforge.net/sourceforge/pcmanfm
comment "pcmanfm requires a toolchain with WCHAR support"
- depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR
+ depends on BR2_PACKAGE_XORG7 && !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/php/Config.ext b/package/php/Config.ext
index 4f1614e..9fd4bde 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -68,12 +68,12 @@ config BR2_PACKAGE_PHP_EXT_FTP
config BR2_PACKAGE_PHP_EXT_GETTEXT
bool "gettext"
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
gettext support
comment "gettext support requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
config BR2_PACKAGE_PHP_EXT_GMP
bool "gmp"
diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in
index eae0a21..a8fdb7c 100644
--- a/package/pkg-config/Config.in
+++ b/package/pkg-config/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_PKG_CONFIG
bool "pkg-config"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
pkg-config is a system for managing library compile/link
@@ -11,4 +11,4 @@ config BR2_PACKAGE_PKG_CONFIG
http://www.freedesktop.org/software/pkgconfig/
comment "pkg-config requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/python/Config.in b/package/python/Config.in
index 11aa267..c49428e 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_PYTHON
bool "python"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_LIBFFI
help
The python language interpreter.
@@ -8,7 +8,7 @@ config BR2_PACKAGE_PYTHON
http://www.python.org/
comment "python requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
if BR2_PACKAGE_PYTHON
diff --git a/package/rrdtool/Config.in b/package/rrdtool/Config.in
index d315b57..825b66d 100644
--- a/package/rrdtool/Config.in
+++ b/package/rrdtool/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_RRDTOOL
bool "rrdtool"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_LIBART
select BR2_PACKAGE_LIBPNG
@@ -12,4 +12,4 @@ config BR2_PACKAGE_RRDTOOL
http://oss.oetiker.ch/rrdtool/
comment "rrdtool requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/ruby/Config.in b/package/ruby/Config.in
index c18d8ad..65c9ba2 100644
--- a/package/ruby/Config.in
+++ b/package/ruby/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_RUBY
bool "ruby"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Object Oriented Scripting Language.
http://www.ruby-lang.org/
comment "ruby requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/sed/Config.in b/package/sed/Config.in
index 950701c..71c803a 100644
--- a/package/sed/Config.in
+++ b/package/sed/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_SED
bool "sed"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Super-useful stream editor.
diff --git a/package/shared-mime-info/Config.in b/package/shared-mime-info/Config.in
index b08c1fd..94ff324 100644
--- a/package/shared-mime-info/Config.in
+++ b/package/shared-mime-info/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_SHARED_MIME_INFO
bool "shared-mime-info"
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBXML2
help
@@ -11,4 +11,4 @@ config BR2_PACKAGE_SHARED_MIME_INFO
http://freedesktop.org/wiki/Software/shared-mime-info
comment "shared-mime-info requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index 66fdde7..c0ead73 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -7,7 +7,7 @@ config BR2_PACKAGE_SSHFS
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
select BR2_PACKAGE_OPENSSH
depends on BR2_TOOLCHAIN_HAS_LARGEFILE
- depends on BR2_USE_WCHAR # glib2
+ depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
help
FUSE makes it possible to implement a filesystem in a userspace
program. Features include: simple yet comprehensive API, secure
@@ -17,4 +17,4 @@ config BR2_PACKAGE_SSHFS
http://fuse.sourceforge.net/sshfs.html
comment "sshfs requires a toolchain with LARGEFILE and WCHAR support"
- depends on !BR2_TOOLCHAIN_HAS_LARGEFILE || !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_LARGEFILE || !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/synergy/Config.in b/package/synergy/Config.in
index 7d8c54e..2d2c82d 100644
--- a/package/synergy/Config.in
+++ b/package/synergy/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_SYNERGY
bool "synergy"
depends on BR2_PACKAGE_XORG7
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_XLIB_LIBXTST
help
Synergy lets you easily share a single mouse and
@@ -13,4 +13,4 @@ config BR2_PACKAGE_SYNERGY
http://synergy2.sourceforge.net/
comment "synergy requires a toolchain with C++ and WCHAR support enabled"
- depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP && !BR2_USE_WCHAR
+ depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP && !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/tar/Config.in b/package/tar/Config.in
index 20529e3..87d2c63 100644
--- a/package/tar/Config.in
+++ b/package/tar/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_TAR
bool "tar"
- depends on BR2_USE_WCHAR && BR2_PROGRAM_INVOCATION
+ depends on BR2_TOOLCHAIN_HAS_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_PROGRAM_INVOCATION)
+ depends on !(BR2_TOOLCHAIN_HAS_WCHAR && BR2_PROGRAM_INVOCATION)
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 34071e4..234c1db 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_WEBKIT
bool "webkit"
depends on BR2_INSTALL_LIBSTDCPP
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
depends on BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_ICU
select BR2_PACKAGE_LIBCURL
@@ -22,4 +22,4 @@ config BR2_PACKAGE_WEBKIT
http://webkit.org/
comment "webkit requires C++, WCHAR in toolchain and libgtk2"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_PACKAGE_LIBGTK2
+ depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_PACKAGE_LIBGTK2
diff --git a/package/wget/Config.in b/package/wget/Config.in
index 172359c..0500678 100644
--- a/package/wget/Config.in
+++ b/package/wget/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_WGET
bool "wget"
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Network utility to retrieve files from http, https and ftp.
http://www.gnu.org/software/wget/
comment "wget requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index f0b731e..301e72c 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -4,7 +4,7 @@ menuconfig BR2_PACKAGE_XORG7
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_FONTCONFIG
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Support for X11R7 libraries, servers, drivers, and/or
applications in the target.
@@ -307,4 +307,4 @@ endmenu
endif
comment "X.org requires a toolchain with WCHAR support"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/xerces/Config.in b/package/xerces/Config.in
index 374729a..96b6279 100644
--- a/package/xerces/Config.in
+++ b/package/xerces/Config.in
@@ -1,10 +1,11 @@
config BR2_PACKAGE_XERCES
bool "xerces-c++"
- depends on BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR
+ depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_WCHAR
+ select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
help
Xerces-C++ is a validating XML parser written in portable C++.
http://xml.apache.org/xerces-c/
comment "xerces-c++ requires a toolchain with C++ and WCHAR support enabled"
- depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR)
+ depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_WCHAR)
diff --git a/toolchain/gdb/Config.in b/toolchain/gdb/Config.in
index 8295f79..a2f2d2c 100644
--- a/toolchain/gdb/Config.in
+++ b/toolchain/gdb/Config.in
@@ -3,12 +3,12 @@ comment "Gdb Options"
config BR2_PACKAGE_GDB
bool "Build gdb debugger for the Target"
select BR2_PACKAGE_NCURSES
- depends on BR2_USE_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_WCHAR
help
Build the full gdb debugger to run on the target.
comment "Gdb debugger for the target needs WCHAR support in toolchain"
- depends on !BR2_USE_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR
config BR2_PACKAGE_GDB_SERVER
bool "Build gdb server for the Target"
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 6ffbc8f..ecf0dd3 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -147,7 +147,7 @@ check_glibc = \
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_RPC,RPC support) ;\
$(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
- $(call check_glibc_feature,BR2_USE_WCHAR,Wide char support) ;\
+ $(call check_glibc_feature,BR2_TOOLCHAIN_HAS_WCHAR,Wide char support) ;\
$(call check_glibc_feature,BR2_PROGRAM_INVOCATION,Program invocation support)
#
@@ -193,7 +193,7 @@ check_uclibc = \
$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_TOOLCHAIN_HAS_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_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_WCHAR__,BR2_TOOLCHAIN_HAS_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) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support)
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 1ade855..53bfd50 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -27,7 +27,7 @@ config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
config BR2_TOOLCHAIN_BUILDROOT_WCHAR
bool "Enable WCHAR support"
- select BR2_USE_WCHAR
+ select BR2_TOOLCHAIN_HAS_WCHAR
help
Enable this option if you want your toolchain to support
wide characters (i.e characters longer than 8 bits, needed
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index dfaa8c3..acabb02 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -14,7 +14,7 @@ config BR2_TOOLCHAIN_HAS_IPV6
config BR2_TOOLCHAIN_HAS_RPC
bool
-config BR2_USE_WCHAR
+config BR2_TOOLCHAIN_HAS_WCHAR
bool
config BR2_ENABLE_LOCALE
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 530b2a4..09ca1c4 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -16,7 +16,7 @@ config BR2_TOOLCHAIN_CTNG_eglibc
select BR2_TOOLCHAIN_HAS_IPV6
select BR2_TOOLCHAIN_HAS_RPC
select BR2_ENABLE_LOCALE
- select BR2_USE_WCHAR
+ select BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PROGRAM_INVOCATION
config BR2_TOOLCHAIN_CTNG_glibc
@@ -25,7 +25,7 @@ config BR2_TOOLCHAIN_CTNG_glibc
select BR2_TOOLCHAIN_HAS_IPV6
select BR2_TOOLCHAIN_HAS_RPC
select BR2_ENABLE_LOCALE
- select BR2_USE_WCHAR
+ select BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PROGRAM_INVOCATION
endchoice # C library
@@ -72,7 +72,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc_INET_RPC
config BR2_TOOLCHAIN_CTNG_uClibc_WCHAR
bool "Enable WCHAR support"
- select BR2_USE_WCHAR
+ select BR2_TOOLCHAIN_HAS_WCHAR
help
Enable this option if you want your toolchain to support
wide characters (i.e characters longer than 8 bits, needed
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 0215287..da37c19 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -272,7 +272,7 @@ CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES)=.*:\# \1 is not set:;
endif
# Handle the wide-char option
-ifneq ($(call qstrip,$(BR2_USE_WCHAR)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_HAS_WCHAR)),)
CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_WCHAR) is not set:\1=y:;
else
CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_WCHAR)=.*:\# \1 is not set:;
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 09115fb..e9290a8 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -146,7 +146,7 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_TOOLCHAIN_HAS_IPV6
select BR2_TOOLCHAIN_HAS_RPC
- select BR2_USE_WCHAR
+ select BR2_TOOLCHAIN_HAS_WCHAR
select BR2_ENABLE_LOCALE
select BR2_PROGRAM_INVOCATION
select BR2_TOOLCHAIN_HAS_THREADS
@@ -198,7 +198,7 @@ config BR2_TOOLCHAIN_EXTERNAL_INET_RPC
config BR2_TOOLCHAIN_EXTERNAL_WCHAR
bool "Toolchain has WCHAR support?"
- select BR2_USE_WCHAR
+ select BR2_TOOLCHAIN_HAS_WCHAR
help
Select this option if your external toolchain supports
WCHAR. If you don't know, leave the default value, Buildroot
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 692d43c..80b5b04 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -313,7 +313,7 @@ ifeq ($(BR2_ENABLE_LOCALE),y)
else
$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
endif
-ifeq ($(BR2_USE_WCHAR),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_WCHAR),y)
$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.oldconfig
else
$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=n,g' $(UCLIBC_DIR)/.oldconfig
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 5/9] Rename BR2_ENABLE_LOCALE_{PURGE, WHITELIST} to BR2_LOCALE_{PURGE, WHITELIST}
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
` (3 preceding siblings ...)
2011-03-07 22:28 ` [Buildroot] [PATCH 4/9] Rename BR2_USE_WCHAR to BR2_TOOLCHAIN_HAS_WCHAR Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 6/9] Rename BR2_ENABLE_LOCALE to BR2_TOOLCHAIN_HAS_LOCALE Thomas Petazzoni
` (4 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Makefile | 6 +++---
toolchain/toolchain-common.in | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 7ae3787..200f9d5 100644
--- a/Makefile
+++ b/Makefile
@@ -327,7 +327,7 @@ include linux/linux.mk
TARGETS+=target-finalize
-ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
+ifeq ($(BR2_LOCALE_PURGE),y)
TARGETS+=target-purgelocales
endif
@@ -479,9 +479,9 @@ ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
$(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)
endif
-ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
+ifeq ($(BR2_LOCALE_PURGE),y)
LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
-LOCALE_NOPURGE=$(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
+LOCALE_NOPURGE=$(call qstrip,$(BR2_LOCALE_WHITELIST))
target-purgelocales:
rm -f $(LOCALE_WHITELIST)
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index acabb02..837237c 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -29,16 +29,16 @@ config BR2_INSTALL_LIBSTDCPP
config BR2_TOOLCHAIN_HAS_THREADS
bool
-config BR2_ENABLE_LOCALE_PURGE
+config BR2_LOCALE_PURGE
bool "Purge unwanted locales"
help
Explicitly specify what locales to install on target. If N
then all locales supported by packages are installed.
-config BR2_ENABLE_LOCALE_WHITELIST
+config BR2_LOCALE_WHITELIST
string "Locales to keep"
default "C en_US de fr"
- depends on BR2_ENABLE_LOCALE_PURGE
+ depends on BR2_LOCALE_PURGE
help
Whitespace seperated list of locales to allow on target.
Locales not listed here will be removed from the target.
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 6/9] Rename BR2_ENABLE_LOCALE to BR2_TOOLCHAIN_HAS_LOCALE
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
` (4 preceding siblings ...)
2011-03-07 22:28 ` [Buildroot] [PATCH 5/9] Rename BR2_ENABLE_LOCALE_{PURGE, WHITELIST} to BR2_LOCALE_{PURGE, WHITELIST} Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 7/9] Rename BR2_PROGRAM_INVOCATION to BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION Thomas Petazzoni
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/arm_nptl_toolchain_defconfig | 2 +-
configs/arm_toolchain_defconfig | 2 +-
package/Makefile.in | 2 +-
package/axel/axel.mk | 2 +-
package/blackbox/Config.in | 2 +-
package/blackbox/blackbox.mk | 2 +-
package/dialog/Config.in | 2 +-
package/dialog/dialog.mk | 2 +-
package/gdk-pixbuf/Config.in | 2 +-
package/gdk-pixbuf/gdk-pixbuf.mk | 2 +-
package/gmpc/Config.in | 2 +-
package/hal/Config.in | 2 +-
package/libglib2/Config.in | 2 +-
package/libglib2/libglib2.mk | 2 +-
package/libiconv/Config.in | 2 +-
package/libiconv/libiconv.mk | 2 +-
package/lsof/lsof.mk | 2 +-
package/multimedia/libmpd/Config.in | 2 +-
package/multimedia/mpd/Config.in | 2 +-
package/multimedia/wavpack/Config.in | 2 +-
package/multimedia/wavpack/wavpack.mk | 2 +-
package/samba/Config.in | 2 +-
package/samba/samba.mk | 2 +-
package/sdl_sound/Config.in | 2 +-
package/sdl_sound/sdl_sound.mk | 2 +-
package/sshfs/Config.in | 2 +-
package/sshfs/sshfs.mk | 2 +-
package/xerces/Config.in | 2 +-
package/xmlstarlet/Config.in | 2 +-
toolchain/dependencies/dependencies.sh | 2 +-
toolchain/gdb/gdb.mk | 2 +-
toolchain/helpers.mk | 4 ++--
toolchain/toolchain-buildroot/Config.in.2 | 2 +-
toolchain/toolchain-common.in | 4 ++--
toolchain/toolchain-crosstool-ng/Config.in | 6 +++---
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
toolchain/toolchain-external/Config.in | 4 ++--
toolchain/uClibc/uclibc.mk | 2 +-
38 files changed, 43 insertions(+), 43 deletions(-)
diff --git a/configs/arm_nptl_toolchain_defconfig b/configs/arm_nptl_toolchain_defconfig
index aa043da..043bd77 100644
--- a/configs/arm_nptl_toolchain_defconfig
+++ b/configs/arm_nptl_toolchain_defconfig
@@ -6,7 +6,7 @@ BR2_arm926t=y
BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_TOOLCHAIN_HAS_IPV6=y
BR2_TOOLCHAIN_HAS_RPC=y
-BR2_ENABLE_LOCALE=y
+BR2_TOOLCHAIN_HAS_LOCALE=y
BR2_TOOLCHAIN_HAS_WCHAR=y
BR2_PTHREADS_NATIVE=y
BR2_INSTALL_LIBSTDCPP=y
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index 9773d74..ae6a550 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -5,7 +5,7 @@ BR2_arm=y
BR2_TOOLCHAIN_HAS_LARGEFILE=y
BR2_TOOLCHAIN_HAS_IPV6=y
BR2_TOOLCHAIN_HAS_RPC=y
-BR2_ENABLE_LOCALE=y
+BR2_TOOLCHAIN_HAS_LOCALE=y
BR2_TOOLCHAIN_HAS_WCHAR=y
BR2_INSTALL_LIBSTDCPP=y
diff --git a/package/Makefile.in b/package/Makefile.in
index 92060bd..ebfc3af 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -289,7 +289,7 @@ TARGET_CONFIGURE_ARGS= \
#######################################################################
-ifeq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
DISABLE_NLS:=
else
DISABLE_NLS:=--disable-nls
diff --git a/package/axel/axel.mk b/package/axel/axel.mk
index 1bf4d81..94fe26a 100644
--- a/package/axel/axel.mk
+++ b/package/axel/axel.mk
@@ -14,7 +14,7 @@ AXEL_DEPENDENCIES += gettext libintl
AXEL_LDFLAGS += -lintl
endif
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
AXEL_DISABLE_I18N=--i18n=0
endif
diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
index 70f7eb4..7e2c1c6 100644
--- a/package/blackbox/Config.in
+++ b/package/blackbox/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_BLACKBOX
bool "blackbox"
depends on BR2_PACKAGE_XORG7
depends on BR2_INSTALL_LIBSTDCPP
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
select BR2_PACKAGE_XLIB_LIBX11
help
Blackbox is a fast, lightweight window manager for the X
diff --git a/package/blackbox/blackbox.mk b/package/blackbox/blackbox.mk
index e3c8c34..0c8e55b 100644
--- a/package/blackbox/blackbox.mk
+++ b/package/blackbox/blackbox.mk
@@ -16,7 +16,7 @@ BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \
BLACKBOX_DEPENDENCIES = xlib_libX11
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
BLACKBOX_DEPENDENCIES += libiconv
endif
diff --git a/package/dialog/Config.in b/package/dialog/Config.in
index 9d3462e..30e3645 100644
--- a/package/dialog/Config.in
+++ b/package/dialog/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_DIALOG
bool "dialog"
select BR2_PACKAGE_NCURSES
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
dialog - display dialog boxes from shell scripts
diff --git a/package/dialog/dialog.mk b/package/dialog/dialog.mk
index e8f025f..5570825 100644
--- a/package/dialog/dialog.mk
+++ b/package/dialog/dialog.mk
@@ -10,7 +10,7 @@ DIALOG_CONF_OPT = --with-ncurses
DIALOG_CONF_ENV = ac_cv_path_NCURSES_CONFIG=true LIBS=-lncurses
DIALOG_DEPENDENCIES = ncurses
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
DIALOG_DEPENDENCIES+=libiconv
endif
diff --git a/package/gdk-pixbuf/Config.in b/package/gdk-pixbuf/Config.in
index 3e96844..34febac 100644
--- a/package/gdk-pixbuf/Config.in
+++ b/package/gdk-pixbuf/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_GDK_PIXBUF
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
Gdk-Pixbuf is an image loader and scaler. It uses GObject
diff --git a/package/gdk-pixbuf/gdk-pixbuf.mk b/package/gdk-pixbuf/gdk-pixbuf.mk
index 83c59bf..7864b38 100644
--- a/package/gdk-pixbuf/gdk-pixbuf.mk
+++ b/package/gdk-pixbuf/gdk-pixbuf.mk
@@ -40,7 +40,7 @@ endif
GDK_PIXBUF_DEPENDENCIES += \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
- $(if $(BR2_ENABLE_LOCALE),,libiconv) \
+ $(if $(BR2_TOOLCHAIN_HAS_LOCALE),,libiconv) \
host-pkg-config libglib2
define GDK_PIXBUF_POST_INSTALL_TWEAKS
diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in
index 23280af..c36097d 100644
--- a/package/gmpc/Config.in
+++ b/package/gmpc/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_GMPC
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
select BR2_PACKAGE_LIBMPD
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBGLADE
diff --git a/package/hal/Config.in b/package/hal/Config.in
index 1117294..a276fb7 100644
--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_HAL
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
select BR2_PACKAGE_DBUS
select BR2_DBUS_EXPAT
select BR2_PACKAGE_DBUS_GLIB
diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in
index 9bd3410..2de7a8c 100644
--- a/package/libglib2/Config.in
+++ b/package/libglib2/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBGLIB2
bool "libglib2"
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
select BR2_PACKAGE_ZLIB
depends on BR2_TOOLCHAIN_HAS_WCHAR # gettext
help
diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk
index 09e3691..e65964b 100644
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@@ -57,7 +57,7 @@ LIBGLIB2_DEPENDENCIES = host-pkg-config host-libglib2 zlib $(if $(BR2_NEEDS_GETT
HOST_LIBGLIB2_DEPENDENCIES = host-pkg-config host-zlib
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
LIBGLIB2_DEPENDENCIES+=libiconv
endif
diff --git a/package/libiconv/Config.in b/package/libiconv/Config.in
index ee4fd62..bec1fab 100644
--- a/package/libiconv/Config.in
+++ b/package/libiconv/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBICONV
bool "libiconv"
- depends on !BR2_ENABLE_LOCALE
+ depends on !BR2_TOOLCHAIN_HAS_LOCALE
help
unicode conversion library
diff --git a/package/libiconv/libiconv.mk b/package/libiconv/libiconv.mk
index 27977a8..4928ef0 100644
--- a/package/libiconv/libiconv.mk
+++ b/package/libiconv/libiconv.mk
@@ -27,6 +27,6 @@ $(eval $(call AUTOTARGETS,package,libiconv))
# Configurations where the toolchain supports locales and the libiconv
# package is enabled are incorrect, because the toolchain already
# provides libiconv functionality, and having both confuses packages.
-ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_ENABLE_LOCALE),yy)
+ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_TOOLCHAIN_HAS_LOCALE),yy)
$(error Libiconv should never be enabled when the toolchain supports locales. Report this failure to Buildroot developers)
endif
diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 745c89c..d5fdff7 100644
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -24,7 +24,7 @@ define LSOF_CONFIGURE_WCHAR_FIXUPS
endef
endif
-ifeq ($(BR2_ENABLE_LOCALE),)
+ifeq ($(BR2_TOOLCHAIN_HAS_LOCALE),)
define LSOF_CONFIGURE_LOCALE_FIXUPS
$(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' \
$(@D)/machine.h
diff --git a/package/multimedia/libmpd/Config.in b/package/multimedia/libmpd/Config.in
index 3652896..50db647 100644
--- a/package/multimedia/libmpd/Config.in
+++ b/package/multimedia/libmpd/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBMPD
bool "libmpd"
depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
High-level client library for accessing Music Player Daemon.
LibMpd is a library that provides high-level, callback-based
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 3efb7c0..6741b6a 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -3,7 +3,7 @@ menuconfig BR2_PACKAGE_MPD
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_LIBGLIB2
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG)
help
MPD is a flexible, powerful, server-side application
diff --git a/package/multimedia/wavpack/Config.in b/package/multimedia/wavpack/Config.in
index 1ef3e42..1985525 100644
--- a/package/multimedia/wavpack/Config.in
+++ b/package/multimedia/wavpack/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_WAVPACK
bool "wavpack"
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
WavPack is a completely open audio compression format providing
lossless, high-quality lossy, and a unique hybrid compression mode.
diff --git a/package/multimedia/wavpack/wavpack.mk b/package/multimedia/wavpack/wavpack.mk
index 035963a..43d95c3 100644
--- a/package/multimedia/wavpack/wavpack.mk
+++ b/package/multimedia/wavpack/wavpack.mk
@@ -9,7 +9,7 @@ WAVPACK_SITE = http://www.wavpack.com
WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2
WAVPACK_INSTALL_STAGING = YES
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
WAVPACK_DEPENDENCIES += libiconv
endif
diff --git a/package/samba/Config.in b/package/samba/Config.in
index 58a84f3..61057d9 100644
--- a/package/samba/Config.in
+++ b/package/samba/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_SAMBA
bool "samba"
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
Provides print services to all manner of SMB/CIFS clients,
including the numerous versions of Microsoft Windows
diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index 160cf2e..d9400de 100644
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -15,7 +15,7 @@ SAMBA_INSTALL_TARGET = YES
SAMBA_DEPENDENCIES = \
- $(if $(BR2_ENABLE_LOCALE),,libiconv) \
+ $(if $(BR2_TOOLCHAIN_HAS_LOCALE),,libiconv) \
$(if $(BR2_PACKAGE_SAMBA_RPCCLIENT),readline) \
$(if $(BR2_PACKAGE_SAMBA_SMBCLIENT),readline) \
$(if $(BR2_PACKAGE_SAMBA_AVAHI),avahi) \
diff --git a/package/sdl_sound/Config.in b/package/sdl_sound/Config.in
index 542c996..f9b4996 100644
--- a/package/sdl_sound/Config.in
+++ b/package/sdl_sound/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_SDL_SOUND
bool "SDL_sound"
depends on BR2_PACKAGE_SDL
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
SDL_sound is a library that handles the decoding of several
popular sound file formats, such as .WAV and .MP3.
diff --git a/package/sdl_sound/sdl_sound.mk b/package/sdl_sound/sdl_sound.mk
index 8f51e05..0fab0e0 100644
--- a/package/sdl_sound/sdl_sound.mk
+++ b/package/sdl_sound/sdl_sound.mk
@@ -10,7 +10,7 @@ SDL_SOUND_INSTALL_STAGING:=YES
SDL_SOUND_INSTALL_TARGET:=YES
SDL_SOUND_DEPENDENCIES = sdl
-ifneq ($(BR2_ENABLE_LOCALE),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
SDL_SOUND_DEPENDENCIES += libiconv
endif
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
index c0ead73..ab1c91d 100644
--- a/package/sshfs/Config.in
+++ b/package/sshfs/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_SSHFS
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
select BR2_PACKAGE_OPENSSH
depends on BR2_TOOLCHAIN_HAS_LARGEFILE
depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
index ae837bb..90851f1 100644
--- a/package/sshfs/sshfs.mk
+++ b/package/sshfs/sshfs.mk
@@ -10,6 +10,6 @@ SSHFS_SOURCE = sshfs-fuse-$(SSHFS_VERSION).tar.gz
SSHFS_DEPENDENCIES = \
libglib2 libfuse openssh \
$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) \
- $(if $(BR2_ENABLE_LOCALE),,libiconv)
+ $(if $(BR2_TOOLCHAIN_HAS_LOCALE),,libiconv)
$(eval $(call AUTOTARGETS,package,sshfs))
diff --git a/package/xerces/Config.in b/package/xerces/Config.in
index 96b6279..ac2559e 100644
--- a/package/xerces/Config.in
+++ b/package/xerces/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XERCES
bool "xerces-c++"
depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_WCHAR
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
Xerces-C++ is a validating XML parser written in portable C++.
diff --git a/package/xmlstarlet/Config.in b/package/xmlstarlet/Config.in
index 99762b8..b639ad2 100644
--- a/package/xmlstarlet/Config.in
+++ b/package/xmlstarlet/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_XMLSTARLET
bool "xmlstarlet"
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_LIBXSLT
- select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+ select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
Command Line XML Toolkit
diff --git a/toolchain/dependencies/dependencies.sh b/toolchain/dependencies/dependencies.sh
index 74ab213..8cfbefb 100755
--- a/toolchain/dependencies/dependencies.sh
+++ b/toolchain/dependencies/dependencies.sh
@@ -140,7 +140,7 @@ for prog in awk bison flex msgfmt makeinfo patch gzip bzip2 perl tar wget cpio p
done
if grep ^BR2_TOOLCHAIN_BUILDROOT=y $CONFIG_FILE > /dev/null && \
- grep ^BR2_ENABLE_LOCALE=y $CONFIG_FILE > /dev/null ; then
+ grep ^BR2_TOOLCHAIN_HAS_LOCALE=y $CONFIG_FILE > /dev/null ; then
if ! which locale > /dev/null ; then
/bin/echo -e "\nYou need locale support on your build machine to build a toolchain supporting locales\n"
exit 1 ;
diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk
index caf3e36..85990ea 100644
--- a/toolchain/gdb/gdb.mk
+++ b/toolchain/gdb/gdb.mk
@@ -87,7 +87,7 @@ $(GDB_TARGET_DIR)/.configured: $(GDB_DIR)/.unpacked
--disable-werror \
$(QUIET) \
)
-ifeq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
-$(SED) "s,^INTL *=.*,INTL = -lintl,g;" $(GDB_DIR)/gdb/Makefile
endif
touch $@
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index ecf0dd3..f767d41 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -145,7 +145,7 @@ check_glibc = \
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_LARGEFILE,Large file support) ;\
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_IPV6,IPv6 support) ;\
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_RPC,RPC support) ;\
- $(call check_glibc_feature,BR2_ENABLE_LOCALE,Locale support) ;\
+ $(call check_glibc_feature,BR2_TOOLCHAIN_HAS_LOCALE,Locale support) ;\
$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_WCHAR,Wide char support) ;\
$(call check_glibc_feature,BR2_PROGRAM_INVOCATION,Program invocation support)
@@ -192,7 +192,7 @@ check_uclibc = \
$(call check_uclibc_feature,__UCLIBC_HAS_LFS__,BR2_TOOLCHAIN_HAS_LARGEFILE,$${UCLIBC_CONFIG_FILE},Large file support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_TOOLCHAIN_HAS_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_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_LOCALE__,BR2_TOOLCHAIN_HAS_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_TOOLCHAIN_HAS_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) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support)
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 53bfd50..56e440c 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -36,7 +36,7 @@ config BR2_TOOLCHAIN_BUILDROOT_WCHAR
config BR2_TOOLCHAIN_BUILDROOT_LOCALE
bool "Enable toolchain locale/i18n support"
select BR2_TOOLCHAIN_BUILDROOT_WCHAR
- select BR2_ENABLE_LOCALE
+ select BR2_TOOLCHAIN_HAS_LOCALE
help
Enable this option if you want your toolchain to support
localization and internationalization.
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 837237c..d96ff90 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -17,7 +17,7 @@ config BR2_TOOLCHAIN_HAS_RPC
config BR2_TOOLCHAIN_HAS_WCHAR
bool
-config BR2_ENABLE_LOCALE
+config BR2_TOOLCHAIN_HAS_LOCALE
bool
config BR2_PROGRAM_INVOCATION
@@ -64,7 +64,7 @@ config BR2_NEEDS_GETTEXT
config BR2_NEEDS_GETTEXT_IF_LOCALE
bool
- default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE)
+ default y if (BR2_NEEDS_GETTEXT && BR2_TOOLCHAIN_HAS_LOCALE)
config BR2_USE_MMU
bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_sh || BR2_xtensa
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 09ca1c4..8b1774f 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -15,7 +15,7 @@ config BR2_TOOLCHAIN_CTNG_eglibc
select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_TOOLCHAIN_HAS_IPV6
select BR2_TOOLCHAIN_HAS_RPC
- select BR2_ENABLE_LOCALE
+ select BR2_TOOLCHAIN_HAS_LOCALE
select BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PROGRAM_INVOCATION
@@ -24,7 +24,7 @@ config BR2_TOOLCHAIN_CTNG_glibc
select BR2_TOOLCHAIN_HAS_LARGEFILE
select BR2_TOOLCHAIN_HAS_IPV6
select BR2_TOOLCHAIN_HAS_RPC
- select BR2_ENABLE_LOCALE
+ select BR2_TOOLCHAIN_HAS_LOCALE
select BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PROGRAM_INVOCATION
@@ -81,7 +81,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc_WCHAR
config BR2_TOOLCHAIN_CTNG_uClibc_LOCALE
bool "Enable toolchain locale/i18n support"
select BR2_TOOLCHAIN_CTNG_uClibc_WCHAR
- select BR2_ENABLE_LOCALE
+ select BR2_TOOLCHAIN_HAS_LOCALE
help
Enable this option if you want your toolchain to support
localization and internationalization.
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index da37c19..b7b4cfe 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -264,7 +264,7 @@ CTNG_FIX_DOT_CONFIG_PATHS_SED += s:^(CT_SYSROOT_DIR_PREFIX)=.*:\1="":;
ifeq ($(BR2_TOOLCHAIN_CTNG_uClibc),y)
# Handle the locales option
-ifneq ($(call qstrip,$(BR2_ENABLE_LOCALE)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_HAS_LOCALE)),)
CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_UCLIBC_LOCALES) is not set:\1=y\n\# CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA is not set:;
CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_UCLIBC_LOCALES_PREGEN_DATA)=.*:\# \1 is not set:;
else
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index e9290a8..9cb54f3 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -147,7 +147,7 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_IPV6
select BR2_TOOLCHAIN_HAS_RPC
select BR2_TOOLCHAIN_HAS_WCHAR
- select BR2_ENABLE_LOCALE
+ select BR2_TOOLCHAIN_HAS_LOCALE
select BR2_PROGRAM_INVOCATION
select BR2_TOOLCHAIN_HAS_THREADS
@@ -207,7 +207,7 @@ config BR2_TOOLCHAIN_EXTERNAL_WCHAR
config BR2_TOOLCHAIN_EXTERNAL_LOCALE
bool "Toolchain has locale support?"
select BR2_TOOLCHAIN_EXTERNAL_WCHAR
- select BR2_ENABLE_LOCALE
+ select BR2_TOOLCHAIN_HAS_LOCALE
help
Select this option if your external toolchain has locale
support. If you don't know, leave the default value,
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index 80b5b04..f3c0dec 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -308,7 +308,7 @@ ifeq ($(BR2_PTHREAD_DEBUG),y)
else
echo "# PTHREADS_DEBUG_SUPPORT is not set" >> $(UCLIBC_DIR)/.oldconfig
endif
-ifeq ($(BR2_ENABLE_LOCALE),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_LOCALE),y)
$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\n# UCLIBC_BUILD_ALL_LOCALE is not set\nUCLIBC_BUILD_MINIMAL_LOCALE=y\nUCLIBC_BUILD_MINIMAL_LOCALES="en_US"\nUCLIBC_PREGENERATED_LOCALE_DATA=n\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=n\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.oldconfig
else
$(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.oldconfig
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 7/9] Rename BR2_PROGRAM_INVOCATION to BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
` (5 preceding siblings ...)
2011-03-07 22:28 ` [Buildroot] [PATCH 6/9] Rename BR2_ENABLE_LOCALE to BR2_TOOLCHAIN_HAS_LOCALE Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 8/9] Rename BR2_INSTALL_LIBSTDCPP to BR2_TOOLCHAIN_HAS_CPP Thomas Petazzoni
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/coreutils/Config.in | 4 ++--
package/tar/Config.in | 4 ++--
package/usbutils/Config.in | 4 ++--
toolchain/helpers.mk | 4 ++--
toolchain/toolchain-buildroot/Config.in.2 | 2 +-
toolchain/toolchain-common.in | 2 +-
toolchain/toolchain-crosstool-ng/Config.in | 6 +++---
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
toolchain/toolchain-external/Config.in | 4 ++--
toolchain/uClibc/uclibc.mk | 2 +-
10 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/package/coreutils/Config.in b/package/coreutils/Config.in
index d72df3a..674c2d4 100644
--- a/package/coreutils/Config.in
+++ b/package/coreutils/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_COREUTILS
bool "coreutils"
- depends on BR2_TOOLCHAIN_HAS_WCHAR && BR2_PROGRAM_INVOCATION
+ depends on BR2_TOOLCHAIN_HAS_WCHAR && BR2_TOOLCHAIN_HAS_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_TOOLCHAIN_HAS_WCHAR && BR2_PROGRAM_INVOCATION)
+ depends on !(BR2_TOOLCHAIN_HAS_WCHAR && BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION)
diff --git a/package/tar/Config.in b/package/tar/Config.in
index 87d2c63..8bfc8f5 100644
--- a/package/tar/Config.in
+++ b/package/tar/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_TAR
bool "tar"
- depends on BR2_TOOLCHAIN_HAS_WCHAR && BR2_PROGRAM_INVOCATION
+ depends on BR2_TOOLCHAIN_HAS_WCHAR && BR2_TOOLCHAIN_HAS_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_TOOLCHAIN_HAS_WCHAR && BR2_PROGRAM_INVOCATION)
+ depends on !(BR2_TOOLCHAIN_HAS_WCHAR && BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION)
diff --git a/package/usbutils/Config.in b/package/usbutils/Config.in
index 0aabc4a..55e9eff 100644
--- a/package/usbutils/Config.in
+++ b/package/usbutils/Config.in
@@ -1,9 +1,9 @@
comment "usbutils requires a toolchain with PROGRAM_INVOCATION support"
- depends on !BR2_PROGRAM_INVOCATION
+ depends on !BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
config BR2_PACKAGE_USBUTILS
bool "usbutils"
- depends on BR2_PROGRAM_INVOCATION
+ depends on BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
select BR2_PACKAGE_LIBUSB
select BR2_PACKAGE_LIBUSB_COMPAT
help
diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index f767d41..ff7c999 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -148,7 +148,7 @@ check_glibc = \
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_LOCALE,Locale support) ;\
$(call check_glibc_feature,BR2_USE_MMU,MMU support) ;\
$(call check_glibc_feature,BR2_TOOLCHAIN_HAS_WCHAR,Wide char support) ;\
- $(call check_glibc_feature,BR2_PROGRAM_INVOCATION,Program invocation support)
+ $(call check_glibc_feature,BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION,Program invocation support)
#
# Check the conformity of Buildroot configuration with regard to the
@@ -194,7 +194,7 @@ check_uclibc = \
$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_TOOLCHAIN_HAS_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_TOOLCHAIN_HAS_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) ;\
+ $(call check_uclibc_feature,__UCLIBC_HAS_PROGRAM_INVOCATION_NAME__,BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION,$${UCLIBC_CONFIG_FILE},Program invocation support) ;\
$(call check_uclibc_feature,__UCLIBC_HAS_THREADS__,BR2_TOOLCHAIN_HAS_THREADS,$${UCLIBC_CONFIG_FILE},Thread support)
#
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 56e440c..07cddd7 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -43,7 +43,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LOCALE
config BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION
bool "Enable 'program invocation name' support"
- select BR2_PROGRAM_INVOCATION
+ select BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
help
Enable this option if you want your toolchain to support the
GNU-specific program_invocation_name and
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index d96ff90..a2aadc1 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -20,7 +20,7 @@ config BR2_TOOLCHAIN_HAS_WCHAR
config BR2_TOOLCHAIN_HAS_LOCALE
bool
-config BR2_PROGRAM_INVOCATION
+config BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
bool
config BR2_INSTALL_LIBSTDCPP
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 8b1774f..6d18ce8 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -17,7 +17,7 @@ config BR2_TOOLCHAIN_CTNG_eglibc
select BR2_TOOLCHAIN_HAS_RPC
select BR2_TOOLCHAIN_HAS_LOCALE
select BR2_TOOLCHAIN_HAS_WCHAR
- select BR2_PROGRAM_INVOCATION
+ select BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
config BR2_TOOLCHAIN_CTNG_glibc
bool "glibc"
@@ -26,7 +26,7 @@ config BR2_TOOLCHAIN_CTNG_glibc
select BR2_TOOLCHAIN_HAS_RPC
select BR2_TOOLCHAIN_HAS_LOCALE
select BR2_TOOLCHAIN_HAS_WCHAR
- select BR2_PROGRAM_INVOCATION
+ select BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
endchoice # C library
@@ -88,7 +88,7 @@ config BR2_TOOLCHAIN_CTNG_uClibc_LOCALE
config BR2_TOOLCHAIN_CTNG_uClibc_PROGRAM_INVOCATION
bool "Enable 'program invocation name' support"
- select BR2_PROGRAM_INVOCATION
+ select BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
help
Enable this option if you want your toolchain to support the
GNU-specific program_invocation_name and
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index b7b4cfe..8c22039 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -302,7 +302,7 @@ CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_RPC)=.*:\# \1 is not set:;
endif
# Handle the program_invocation_name option
-ifneq ($(call qstrip,$(BR2_PROGRAM_INVOCATION)),)
+ifneq ($(call qstrip,$(BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION)),)
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^\# (UCLIBC_HAS_PROGRAM_INVOCATION_NAME) is not set:\1=y:;
else
CTNG_FIX_DOT_CONFIG_LIBC_SED += s:^(UCLIBC_HAS_PROGRAM_INVOCATION_NAME)=y:\# \1 is not set:;
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 9cb54f3..5fc3096 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -148,7 +148,7 @@ config BR2_TOOLCHAIN_EXTERNAL_GLIBC
select BR2_TOOLCHAIN_HAS_RPC
select BR2_TOOLCHAIN_HAS_WCHAR
select BR2_TOOLCHAIN_HAS_LOCALE
- select BR2_PROGRAM_INVOCATION
+ select BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
select BR2_TOOLCHAIN_HAS_THREADS
config BR2_TOOLCHAIN_EXTERNAL_UCLIBC
@@ -215,7 +215,7 @@ config BR2_TOOLCHAIN_EXTERNAL_LOCALE
config BR2_TOOLCHAIN_EXTERNAL_PROGRAM_INVOCATION
bool "Toolchain has program invocation support?"
- select BR2_PROGRAM_INVOCATION
+ select BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
help
Select this option if your external toolchain has program
invocation support. If you don't know, leave the default
diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index f3c0dec..dfb4700 100644
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -318,7 +318,7 @@ ifeq ($(BR2_TOOLCHAIN_HAS_WCHAR),y)
else
$(SED) 's,^.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=n,g' $(UCLIBC_DIR)/.oldconfig
endif
-ifeq ($(BR2_PROGRAM_INVOCATION),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION),y)
$(SED) 's,^.*UCLIBC_HAS_PROGRAM_INVOCATION_NAME.*,UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y,g' $(UCLIBC_DIR)/.oldconfig
$(SED) 's,^.*UCLIBC_HAS___PROGNAME.*,UCLIBC_HAS___PROGNAME=y,g' $(UCLIBC_DIR)/.oldconfig
else
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 8/9] Rename BR2_INSTALL_LIBSTDCPP to BR2_TOOLCHAIN_HAS_CPP
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
` (6 preceding siblings ...)
2011-03-07 22:28 ` [Buildroot] [PATCH 7/9] Rename BR2_PROGRAM_INVOCATION to BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 9/9] Fix minor spacing/tabs issues in package/*/Config.in Thomas Petazzoni
2011-03-19 10:00 ` [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
configs/arm_nptl_toolchain_defconfig | 2 +-
configs/arm_toolchain_defconfig | 2 +-
package/Makefile.in | 2 +-
package/alsamixergui/Config.in | 4 ++--
package/blackbox/Config.in | 4 ++--
package/ctorrent/Config.in | 4 ++--
package/cups/Config.in | 4 ++--
package/dmalloc/dmalloc.mk | 2 +-
package/enchant/Config.in | 4 ++--
package/fltk/Config.in | 4 ++--
package/gperf/Config.in | 4 ++--
package/gpsd/gpsd.mk | 2 +-
package/icu/Config.in | 4 ++--
package/iperf/Config.in | 4 ++--
package/kismet/Config.in | 4 ++--
package/libcgicc/Config.in | 4 ++--
package/libconfig/libconfig.mk | 2 +-
package/libgtk2/Config.in | 4 ++--
package/libsigc/Config.in | 4 ++--
package/lzma/Config.in | 4 ++--
package/midori/Config.in | 4 ++--
package/multimedia/festival/Config.in | 4 ++--
package/multimedia/festival/speech-tools/Config.in | 4 ++--
package/multimedia/gst-plugins-base/Config.in | 4 ++--
package/multimedia/mpd/Config.in | 4 ++--
package/multimedia/swfdec/Config.in | 4 ++--
package/multimedia/taglib/Config.in | 4 ++--
package/mysql_client/Config.in | 4 ++--
package/oprofile/Config.in | 4 ++--
package/pango/Config.in | 4 ++--
package/pcre/pcre.mk | 2 +-
package/php/Config.ext | 4 ++--
package/qt/Config.in | 4 ++--
package/rpm/Config.in | 4 ++--
package/smartmontools/Config.in | 4 ++--
package/squid/Config.in | 4 ++--
package/synergy/Config.in | 4 ++--
package/webkit/Config.in | 4 ++--
package/x11r7/Config.in | 4 ++--
package/x11r7/mesa3d/Config.in | 2 +-
package/xerces/Config.in | 4 ++--
target/xtensa/defconfig | 2 +-
toolchain/gcc/Config.in | 2 +-
toolchain/gcc/gcc-uclibc-4.x.mk | 6 +++---
toolchain/toolchain-buildroot/Config.in.2 | 2 +-
toolchain/toolchain-common.in | 2 +-
toolchain/toolchain-crosstool-ng/Config.in | 2 +-
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 2 +-
toolchain/toolchain-external/Config.in | 14 +++++++-------
toolchain/toolchain-external/ext-tool.mk | 4 ++--
50 files changed, 92 insertions(+), 92 deletions(-)
diff --git a/configs/arm_nptl_toolchain_defconfig b/configs/arm_nptl_toolchain_defconfig
index 043bd77..edca979 100644
--- a/configs/arm_nptl_toolchain_defconfig
+++ b/configs/arm_nptl_toolchain_defconfig
@@ -9,7 +9,7 @@ BR2_TOOLCHAIN_HAS_RPC=y
BR2_TOOLCHAIN_HAS_LOCALE=y
BR2_TOOLCHAIN_HAS_WCHAR=y
BR2_PTHREADS_NATIVE=y
-BR2_INSTALL_LIBSTDCPP=y
+BR2_TOOLCHAIN_HAS_CPP=y
# No package
# BR2_PACKAGE_BUSYBOX is not set
diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig
index ae6a550..7f8b8c3 100644
--- a/configs/arm_toolchain_defconfig
+++ b/configs/arm_toolchain_defconfig
@@ -7,7 +7,7 @@ BR2_TOOLCHAIN_HAS_IPV6=y
BR2_TOOLCHAIN_HAS_RPC=y
BR2_TOOLCHAIN_HAS_LOCALE=y
BR2_TOOLCHAIN_HAS_WCHAR=y
-BR2_INSTALL_LIBSTDCPP=y
+BR2_TOOLCHAIN_HAS_CPP=y
# No package
# BR2_PACKAGE_BUSYBOX is not set
diff --git a/package/Makefile.in b/package/Makefile.in
index ebfc3af..849c8d9 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -307,7 +307,7 @@ ifneq ($(BR2_TOOLCHAIN_HAS_IPV6),y)
DISABLE_IPV6= --disable-ipv6
endif
-ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_CPP),y)
TARGET_CONFIGURE_OPTS+=CXX=false
endif
diff --git a/package/alsamixergui/Config.in b/package/alsamixergui/Config.in
index 3afc314..02fcbcb 100644
--- a/package/alsamixergui/Config.in
+++ b/package/alsamixergui/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_ALSAMIXERGUI
depends on BR2_PACKAGE_XORG7
depends on BR2_PACKAGE_ALSA_LIB
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
select BR2_PACKAGE_FLTK
select BR2_PACKAGE_ALSA_LIB_PCM
select BR2_PACKAGE_ALSA_LIB_MIXER
@@ -12,4 +12,4 @@ config BR2_PACKAGE_ALSAMIXERGUI
http://www.iua.upf.es/~mdeboer/projects/alsamixergui/
comment "alsamixergui requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7 && BR2_PACKAGE_ALSA_LIB
+ depends on !BR2_TOOLCHAIN_HAS_CPP && BR2_PACKAGE_XORG7 && BR2_PACKAGE_ALSA_LIB
diff --git a/package/blackbox/Config.in b/package/blackbox/Config.in
index 7e2c1c6..5dc6526 100644
--- a/package/blackbox/Config.in
+++ b/package/blackbox/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_BLACKBOX
bool "blackbox"
depends on BR2_PACKAGE_XORG7
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
select BR2_PACKAGE_XLIB_LIBX11
help
@@ -11,4 +11,4 @@ config BR2_PACKAGE_BLACKBOX
http://blackboxwm.sourceforge.net/
comment "blackbox requires a toolchain with C++ support enabled"
- depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP
+ depends on BR2_PACKAGE_XORG7 && !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/ctorrent/Config.in b/package/ctorrent/Config.in
index 5e26c12..7cd217c 100644
--- a/package/ctorrent/Config.in
+++ b/package/ctorrent/Config.in
@@ -1,9 +1,9 @@
comment "ctorrent requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
config BR2_PACKAGE_CTORRENT
bool "ctorrent"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
CTorrent is a BitTorrent client implemented in C++
to be lightweight and quick.
diff --git a/package/cups/Config.in b/package/cups/Config.in
index 0176423..6969369 100644
--- a/package/cups/Config.in
+++ b/package/cups/Config.in
@@ -9,11 +9,11 @@ if BR2_PACKAGE_CUPS
config BR2_PACKAGE_CUPS_PDFTOPS
bool "pdftops support"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
Enable pdftops support
comment "pdftops support requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
endif
diff --git a/package/dmalloc/dmalloc.mk b/package/dmalloc/dmalloc.mk
index dca0488..a94f186 100644
--- a/package/dmalloc/dmalloc.mk
+++ b/package/dmalloc/dmalloc.mk
@@ -10,7 +10,7 @@ DMALLOC_SITE:=http://dmalloc.com/releases
DMALLOC_INSTALL_STAGING = YES
DMALLOC_CONF_OPT:= --enable-shlib
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_CPP),y)
DMALLOC_CONF_OPT+=--enable-cxx
else
DMALLOC_CONF_OPT+=--disable-cxx
diff --git a/package/enchant/Config.in b/package/enchant/Config.in
index 4451e0a..af1667a 100644
--- a/package/enchant/Config.in
+++ b/package/enchant/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_ENCHANT
bool "enchant"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
select BR2_PACKAGE_LIBGLIB2
help
@@ -10,4 +10,4 @@ config BR2_PACKAGE_ENCHANT
http://www.abisource.com/projects/enchant/
comment "enchant requires a toolchain with C++ and WCHAR support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_CPP || !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/fltk/Config.in b/package/fltk/Config.in
index eff72b5..f3368b9 100644
--- a/package/fltk/Config.in
+++ b/package/fltk/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_FLTK
bool "fltk"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXT
help
@@ -10,4 +10,4 @@ config BR2_PACKAGE_FLTK
http://www.fltk.org/
comment "fltk requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7
+ depends on !BR2_TOOLCHAIN_HAS_CPP && BR2_PACKAGE_XORG7
diff --git a/package/gperf/Config.in b/package/gperf/Config.in
index 67b286b..8465d0a 100644
--- a/package/gperf/Config.in
+++ b/package/gperf/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_GPERF
bool "gperf"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
A 'perfect hash function' generator
http://www.gnu.org/software/gperf/
comment "gperf requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 60f884b..7042a86 100644
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -11,7 +11,7 @@ GPSD_CONF_OPT = --disable-static
GPSD_TARGET_BINS = cgps gpsctl gpsdecode gpsmon gpspipe gpxlogger lcdgps
# Build libgpsmm if we've got C++
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_CPP),y)
GPSD_CONF_OPT += --enable-libgpsmm LDFLAGS="$(TARGET_LDFLAGS) -lstdc++"
else
GPSD_CONF_OPT += --disable-libgpsmm
diff --git a/package/icu/Config.in b/package/icu/Config.in
index e593f85..7abb93d 100644
--- a/package/icu/Config.in
+++ b/package/icu/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_ICU
bool "icu"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BR2_TOOLCHAIN_HAS_WCHAR
help
International Components for Unicode.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_ICU
http://site.icu-project.org/
comment "icu requires a toolchain with C++ support and WCHAR enabled"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_CPP || !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/iperf/Config.in b/package/iperf/Config.in
index c4c25b3..ee9c96e 100644
--- a/package/iperf/Config.in
+++ b/package/iperf/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_IPERF
bool "iperf"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
Internet Protocol bandwidth measuring tool for measuring
TCP/UDP performance.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_IPERF
http://dast.nlanr.net/projects/iperf/
comment "iperf requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/kismet/Config.in b/package/kismet/Config.in
index 6954665..b8208ba 100644
--- a/package/kismet/Config.in
+++ b/package/kismet/Config.in
@@ -1,9 +1,9 @@
comment "Kismet requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
config BR2_PACKAGE_KISMET
bool "kismet"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_NCURSES_TARGET_PANEL
select BR2_PACKAGE_LIBPCAP
diff --git a/package/libcgicc/Config.in b/package/libcgicc/Config.in
index 098f9a6..2d38f87 100644
--- a/package/libcgicc/Config.in
+++ b/package/libcgicc/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBCGICC
bool "libcgicc"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
GNU cgicc is a C++ class library that greatly simplifies
the creation of CGI applications for the World Wide Web.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_LIBCGICC
http://www.cgicc.com
comment "libcgicc requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/libconfig/libconfig.mk b/package/libconfig/libconfig.mk
index 6e232a4..6336e45 100644
--- a/package/libconfig/libconfig.mk
+++ b/package/libconfig/libconfig.mk
@@ -10,7 +10,7 @@ LIBCONFIG_AUTORECONF:=NO
LIBCONFIG_INSTALL_STAGING:=YES
LIBCONFIG_INSTALL_TARGET:=YES
-ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_CPP),y)
LIBCONFIG_CONF_OPT:=--disable-cxx
endif
diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in
index 4aca9c7..5e79725 100644
--- a/package/libgtk2/Config.in
+++ b/package/libgtk2/Config.in
@@ -10,11 +10,11 @@ config BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_GDK_PIXBUF
depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB
depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
- depends on BR2_INSTALL_LIBSTDCPP # pango
+ depends on BR2_TOOLCHAIN_HAS_CPP # pango
help
The GTK+ version 2 graphical user interface library
http://www.gtk.org/
comment "libgtk2 requires a toolchain with WCHAR and C++ support"
- depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/libsigc/Config.in b/package/libsigc/Config.in
index 93fa3f4..2827250 100644
--- a/package/libsigc/Config.in
+++ b/package/libsigc/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBSIGC
bool "libsigc++"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
libsigc++ implements a typesafe callback system for standard C++.
It allows you to define signals and to connect those signals to
@@ -10,4 +10,4 @@ config BR2_PACKAGE_LIBSIGC
http://libsigc.sourceforge.net/
comment "libsigc++ requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/lzma/Config.in b/package/lzma/Config.in
index 2b94dde..a3bd328 100644
--- a/package/lzma/Config.in
+++ b/package/lzma/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_LZMA
bool "lzma"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BR2_DEPRECATED
help
Lempel Ziv compression method (LZMA) is a compression
@@ -9,4 +9,4 @@ config BR2_PACKAGE_LZMA
http://tukaani.org/lzma/
comment "lzma requires a toolchain with C++ support"
- depends on !BR2_INSTALL_LIBSTDCPP && BR2_DEPRECATED
+ depends on !BR2_TOOLCHAIN_HAS_CPP && BR2_DEPRECATED
diff --git a/package/midori/Config.in b/package/midori/Config.in
index 30dbde3..247e28e 100644
--- a/package/midori/Config.in
+++ b/package/midori/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_MIDORI
select BR2_PACKAGE_WEBKIT
select BR2_PACKAGE_LIBSEXY
depends on BR2_PACKAGE_LIBGTK2
- depends on BR2_INSTALL_LIBSTDCPP # webkit
+ depends on BR2_TOOLCHAIN_HAS_CPP # webkit
depends on BR2_TOOLCHAIN_HAS_WCHAR # webkit
help
Midori is a lightweight web browser based on WebKit
@@ -11,4 +11,4 @@ config BR2_PACKAGE_MIDORI
http://software.twotoasts.de/?page=midori
comment "midori requires C++, WCHAR in toolchain and libgtk2"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_PACKAGE_LIBGTK2
+ depends on !BR2_TOOLCHAIN_HAS_CPP || !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_PACKAGE_LIBGTK2
diff --git a/package/multimedia/festival/Config.in b/package/multimedia/festival/Config.in
index e05fde9..7dad860 100644
--- a/package/multimedia/festival/Config.in
+++ b/package/multimedia/festival/Config.in
@@ -1,6 +1,6 @@
menuconfig BR2_PACKAGE_FESTIVAL
bool "festival text-to-speech system"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BROKEN # doesn't build
select BR2_PACKAGE_ALSA_LIB
select BR2_PACKAGE_SPEECH_TOOLS
@@ -24,4 +24,4 @@ if BR2_PACKAGE_FESTIVAL
endif
comment "festival requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/multimedia/festival/speech-tools/Config.in b/package/multimedia/festival/speech-tools/Config.in
index e82ea1e..40e919e 100644
--- a/package/multimedia/festival/speech-tools/Config.in
+++ b/package/multimedia/festival/speech-tools/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_SPEECH_TOOLS
bool "speech tools for festival"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
Speech tools for the festival text to speech system
http://festvox.org/packed/festival/latest
comment "speech tools requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index 09c243c..a21e134 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -73,11 +73,11 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG
config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO
bool "pango font renderer"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
select BR2_PACKAGE_PANGO
comment "pango plugin requires a toolchain with C++ support"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA
bool "theora (*.ogg video)"
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index 6741b6a..a248ee1 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -1,6 +1,6 @@
menuconfig BR2_PACKAGE_MPD
bool "mpd"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
@@ -161,4 +161,4 @@ config BR2_PACKAGE_MPD_WAVPACK
endif
comment "mpd requires a toolchain with C++ and WCHAR support"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR
+ depends on !BR2_TOOLCHAIN_HAS_CPP || !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/multimedia/swfdec/Config.in b/package/multimedia/swfdec/Config.in
index 77fc919..3cdaf1a 100644
--- a/package/multimedia/swfdec/Config.in
+++ b/package/multimedia/swfdec/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_SWFDEC
bool "swfdec"
depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
- depends on BR2_INSTALL_LIBSTDCPP # pango
+ depends on BR2_TOOLCHAIN_HAS_CPP # pango
select BR2_PACKAGE_LIBOIL
select BR2_PACKAGE_ALSA_LIB
select BR2_PACKAGE_PANGO
@@ -32,4 +32,4 @@ config BR2_PACKAGE_SWFDEC_GSTREAMER
Enables GStreamer support
comment "swfdec requires a toolchain with WCHAR and C++ support"
- depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/multimedia/taglib/Config.in b/package/multimedia/taglib/Config.in
index 3d688a7..67b8f42 100644
--- a/package/multimedia/taglib/Config.in
+++ b/package/multimedia/taglib/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_TAGLIB
bool "taglib"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
TagLib is a library for reading and editing the meta-data of
several popular audio formats. Currently it supports both ID3v1
@@ -10,4 +10,4 @@ config BR2_PACKAGE_TAGLIB
http://developer.kde.org/~wheeler/taglib.html
comment "taglib requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/mysql_client/Config.in b/package/mysql_client/Config.in
index f07fdb4..8edcd2e 100644
--- a/package/mysql_client/Config.in
+++ b/package/mysql_client/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_MYSQL_CLIENT
bool "MySQL client"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
select BR2_PACKAGE_NCURSES
select BR2_PACKAGE_READLINE
help
MySQL client
comment "Mysql client requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/oprofile/Config.in b/package/oprofile/Config.in
index 0e3652d..59aac9e 100644
--- a/package/oprofile/Config.in
+++ b/package/oprofile/Config.in
@@ -6,7 +6,7 @@ config BR2_PACKAGE_OPROFILE
depends on !BR2_TOOLCHAIN_EXTERNAL
select BR2_PACKAGE_POPT
select BR2_PACKAGE_BINUTILS
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
OProfile is a system-wide profiler for Linux systems,
capable of profiling all running code at low overhead.
@@ -24,4 +24,4 @@ config BR2_PACKAGE_OPROFILE
libraries, and applications.
comment "oprofile requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/pango/Config.in b/package/pango/Config.in
index f852e00..f6fcf19 100644
--- a/package/pango/Config.in
+++ b/package/pango/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_PANGO
bool "pango"
depends on BR2_TOOLCHAIN_HAS_WCHAR # glib2
- depends on BR2_INSTALL_LIBSTDCPP # freetype support
+ depends on BR2_TOOLCHAIN_HAS_CPP # freetype support
select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_CAIRO
@@ -17,4 +17,4 @@ config BR2_PACKAGE_PANGO
http://www.pango.org/
comment "pango requires a toolchain with WCHAR and C++ support"
- depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/pcre/pcre.mk b/package/pcre/pcre.mk
index d2a1331..ece287c 100644
--- a/package/pcre/pcre.mk
+++ b/package/pcre/pcre.mk
@@ -8,7 +8,7 @@ PCRE_VERSION = 7.9
PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre
PCRE_INSTALL_STAGING = YES
-ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifneq ($(BR2_TOOLCHAIN_HAS_CPP),y)
# pcre will use the host g++ if a cross version isn't available
PCRE_CONF_OPT = --disable-cpp
endif
diff --git a/package/php/Config.ext b/package/php/Config.ext
index 9fd4bde..a9dbcb3 100644
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -173,12 +173,12 @@ config BR2_PACKAGE_PHP_EXT_PDO_SQLITE_EXTERNAL
config BR2_PACKAGE_PHP_EXT_PDO_MYSQL
bool "PDO_MySQL"
depends on BR2_PACKAGE_PHP_EXT_PDO
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
select BR2_PACKAGE_MYSQL_CLIENT
help
PDO driver for MySQL
comment "PDO_MySQL requires a toolchain with C++ support"
- depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_PHP_EXT_PDO
+ depends on !BR2_TOOLCHAIN_HAS_CPP && BR2_PACKAGE_PHP_EXT_PDO
endmenu
diff --git a/package/qt/Config.in b/package/qt/Config.in
index 3cc04f4..f4a2857 100644
--- a/package/qt/Config.in
+++ b/package/qt/Config.in
@@ -1,9 +1,9 @@
comment "qt requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
menuconfig BR2_PACKAGE_QT
bool "Qt"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
Qt for Embedded Linux.
diff --git a/package/rpm/Config.in b/package/rpm/Config.in
index 8d4c6a3..22be769 100644
--- a/package/rpm/Config.in
+++ b/package/rpm/Config.in
@@ -25,11 +25,11 @@ config BR2_PACKAGE_RPM_BZIP2_PAYLOADS
config BR2_PACKAGE_RPM_XZ_PAYLOADS
bool "support for xz payloads"
depends on BR2_PACKAGE_RPM
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
Support for xz payloads in RPM.
comment "xz payload support requires a toolchain with c++ support"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/smartmontools/Config.in b/package/smartmontools/Config.in
index 18320f0..4b45e70 100644
--- a/package/smartmontools/Config.in
+++ b/package/smartmontools/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_SMARTMONTOOLS
bool "smartmontools"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
Control and monitor storage systems using S.M.A.R.T.
http://smartmontools.sourceforge.net/
comment "smartmontools requires a toolchain with C++ support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_TOOLCHAIN_HAS_CPP
diff --git a/package/squid/Config.in b/package/squid/Config.in
index 5834ac9..56994e1 100644
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,9 +1,9 @@
comment "Squid requires a toolchain with C++ and IPv6 support enabled"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_IPV6
+ depends on !BR2_TOOLCHAIN_HAS_CPP || !BR2_TOOLCHAIN_HAS_IPV6
config BR2_PACKAGE_SQUID
bool "squid"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BR2_TOOLCHAIN_HAS_IPV6
select BR2_PACKAGE_LIBCAP
help
diff --git a/package/synergy/Config.in b/package/synergy/Config.in
index 2d2c82d..655bd45 100644
--- a/package/synergy/Config.in
+++ b/package/synergy/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_SYNERGY
bool "synergy"
depends on BR2_PACKAGE_XORG7
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_XLIB_LIBXTST
help
@@ -13,4 +13,4 @@ config BR2_PACKAGE_SYNERGY
http://synergy2.sourceforge.net/
comment "synergy requires a toolchain with C++ and WCHAR support enabled"
- depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP && !BR2_TOOLCHAIN_HAS_WCHAR
+ depends on BR2_PACKAGE_XORG7 && !BR2_TOOLCHAIN_HAS_CPP && !BR2_TOOLCHAIN_HAS_WCHAR
diff --git a/package/webkit/Config.in b/package/webkit/Config.in
index 234c1db..eb4a401 100644
--- a/package/webkit/Config.in
+++ b/package/webkit/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_WEBKIT
bool "webkit"
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
depends on BR2_TOOLCHAIN_HAS_WCHAR
depends on BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_ICU
@@ -22,4 +22,4 @@ config BR2_PACKAGE_WEBKIT
http://webkit.org/
comment "webkit requires C++, WCHAR in toolchain and libgtk2"
- depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_PACKAGE_LIBGTK2
+ depends on !BR2_TOOLCHAIN_HAS_CPP || !BR2_TOOLCHAIN_HAS_WCHAR || !BR2_PACKAGE_LIBGTK2
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 301e72c..dfcec9a 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -19,10 +19,10 @@ choice
config BR2_PACKAGE_XSERVER_xorg
bool "Modular X.org"
- depends on BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_TOOLCHAIN_HAS_CPP
comment 'X.org requires largefile and C++ support'
- depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_INSTALL_LIBSTDCPP)
+ depends on !(BR2_TOOLCHAIN_HAS_LARGEFILE && BR2_TOOLCHAIN_HAS_CPP)
config BR2_PACKAGE_XSERVER_tinyx
bool "TinyX"
diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in
index 596eea3..acbb4b9 100644
--- a/package/x11r7/mesa3d/Config.in
+++ b/package/x11r7/mesa3d/Config.in
@@ -9,7 +9,7 @@ config BR2_PACKAGE_MESA3D
select BR2_PACKAGE_EXPAT
depends on BR2_PACKAGE_XSERVER_XORG_SERVER
depends on BR2_PACKAGE_XSERVER_xorg
- depends on BR2_INSTALL_LIBSTDCPP
+ depends on BR2_TOOLCHAIN_HAS_CPP
help
Mesa 3D, an open-source implementation of the OpenGL specification.
diff --git a/package/xerces/Config.in b/package/xerces/Config.in
index ac2559e..46bb5e9 100644
--- a/package/xerces/Config.in
+++ b/package/xerces/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XERCES
bool "xerces-c++"
- depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_WCHAR
+ depends on BR2_TOOLCHAIN_HAS_CPP && BR2_TOOLCHAIN_HAS_WCHAR
select BR2_PACKAGE_LIBICONV if !BR2_TOOLCHAIN_HAS_LOCALE
help
Xerces-C++ is a validating XML parser written in portable C++.
@@ -8,4 +8,4 @@ config BR2_PACKAGE_XERCES
http://xml.apache.org/xerces-c/
comment "xerces-c++ requires a toolchain with C++ and WCHAR support enabled"
- depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_WCHAR)
+ depends on !(BR2_TOOLCHAIN_HAS_CPP && BR2_TOOLCHAIN_HAS_WCHAR)
diff --git a/target/xtensa/defconfig b/target/xtensa/defconfig
index b03aedc..4a3ebb7 100644
--- a/target/xtensa/defconfig
+++ b/target/xtensa/defconfig
@@ -53,7 +53,7 @@ BR2_GCC_VERSION="4.3.2"
BR2_TOOLCHAIN_SYSROOT=y
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
BR2_GCC_CROSS_CXX=y
-BR2_INSTALL_LIBSTDCPP=y
+BR2_TOOLCHAIN_HAS_CPP=y
BR2_GCC_SHARED_LIBGCC=y
#
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index c989b05..108c860 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -79,7 +79,7 @@ config BR2_GCC_CROSS_JAVA
config BR2_INSTALL_LIBGCJ
bool "Build/install java compiler and libgcj?"
- depends on !BR2_avr32 && BR2_INSTALL_LIBSTDCPP
+ depends on !BR2_avr32 && BR2_TOOLCHAIN_HAS_CPP
select BR2_GCC_CROSS_JAVA
select BR2_TOOLCHAIN_HAS_LARGEFILE
depends on BROKEN
diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index 96bebd6..43d519c 100644
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -64,7 +64,7 @@ GCC_STAGING_PREREQ+=$(STAGING_DIR)/usr/lib/libc.a
GCC_TARGET_LANGUAGES:=c
GCC_CROSS_LANGUAGES:=c
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_CPP),y)
GCC_CROSS_LANGUAGES:=$(GCC_CROSS_LANGUAGES),c++
endif
ifeq ($(BR2_GCC_CROSS_FORTRAN),y)
@@ -91,7 +91,7 @@ GCC_STAGING_PREREQ+=$(GCC_COMMON_PREREQ) \
$(wildcard $(BR2_DEPENDS_DIR)/br2/extra/gcc/config/options*)\
$(wildcard $(BR2_DEPENDS_DIR)/br2/gcc/cross/*)
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_CPP),y)
GCC_TARGET_LANGUAGES:=$(GCC_TARGET_LANGUAGES),c++
endif
@@ -432,7 +432,7 @@ ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
$(TARGET_DIR)/lib/
-$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgcc_s*
endif
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_CPP),y)
ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
mkdir -p $(TARGET_DIR)/usr/lib
-cp -dpf $(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib*/libstdc++.so* \
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2
index 07cddd7..7ce4852 100644
--- a/toolchain/toolchain-buildroot/Config.in.2
+++ b/toolchain/toolchain-buildroot/Config.in.2
@@ -53,7 +53,7 @@ config BR2_TOOLCHAIN_BUILDROOT_PROGRAM_INVOCATION
config BR2_TOOLCHAIN_BUILDROOT_CXX
bool "Enable C++ support"
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
depends on !(! BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE && \
BR2_TOOLCHAIN_BUILDROOT_LOCALE && \
BR2_UCLIBC_VERSION_0_9_31)
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index a2aadc1..ff0e37e 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -23,7 +23,7 @@ config BR2_TOOLCHAIN_HAS_LOCALE
config BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
bool
-config BR2_INSTALL_LIBSTDCPP
+config BR2_TOOLCHAIN_HAS_CPP
bool
config BR2_TOOLCHAIN_HAS_THREADS
diff --git a/toolchain/toolchain-crosstool-ng/Config.in b/toolchain/toolchain-crosstool-ng/Config.in
index 6d18ce8..3ce480e 100644
--- a/toolchain/toolchain-crosstool-ng/Config.in
+++ b/toolchain/toolchain-crosstool-ng/Config.in
@@ -100,7 +100,7 @@ endif # BR2_TOOLCHAIN_CTNG_uClibc
config BR2_TOOLCHAIN_CTNG_CXX
bool "Enable C++ support"
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
help
Enable this option if you want your toolchain to support the
C++ language and you want C++ libraries to be installed on
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index 8c22039..a966b04 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -51,7 +51,7 @@ CTNG_LIBS_LIB += $(CTNG_LIBS_$(call qstrip,$(BR2_TOOLCHAIN_CTNG_LIBC)))
#--------------
# All that we need in /usr/lib
-ifneq ($(BR2_INSTALL_LIBSTDCPP),)
+ifneq ($(BR2_TOOLCHAIN_HAS_CPP),)
CTNG_LIBS_USR_LIB += libstdc++.so
endif
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 5fc3096..efc63dc 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -7,7 +7,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM201009
bool "CodeSourcery ARM 2010.09"
depends on BR2_arm
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
help
Toolchain for the ARM architecture, from CodeSourcery. It
uses gcc 4.5.1, binutils 2.20, glibc 2.11 and gdb 7.2.50,
@@ -21,7 +21,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2010Q1
bool "CodeSourcery ARM 2010q1"
depends on BR2_arm
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
help
Toolchain for the ARM architecture, from CodeSourcery. It
uses gcc 4.4.1, binutils 2.19, glibc 2.11, gdb 7.0.50 and
@@ -35,7 +35,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM2009Q1
bool "CodeSourcery ARM 2009q1"
depends on BR2_arm
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
help
Toolchain for the ARM architecture, from CodeSourcery. It
uses gcc 4.3.3, binutils 2.19, glibc 2.8 and gdb 6.8 and
@@ -49,7 +49,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS44
bool "CodeSourcery MIPS 4.4"
depends on BR2_mips || BR2_mipsel
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
help
Toolchain for the MIPS architecture, from CodeSourcery. It
uses gcc 4.4.1, binutils 2.19, glibc 2.11, uClibc 0.9.30 and
@@ -72,7 +72,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009
bool "CodeSoucery PowerPC 2010.09"
depends on BR2_powerpc
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
help
Toolchain for the PowerPC architecture, from
CodeSourcery. It uses gcc 4.5.1, binutils 2.20, glibc 2.11,
@@ -90,7 +90,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201009
bool "CodeSoucery PowerPC 2010.09"
depends on BR2_sh
select BR2_TOOLCHAIN_EXTERNAL_GLIBC
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
help
Toolchain for the SuperH architecture, from CodeSourcery. It
uses gcc 4.5.1, binutils 2.20, glibc 2.11, uClibc 0.9.30,
@@ -233,7 +233,7 @@ endif # BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
config BR2_TOOLCHAIN_EXTERNAL_CXX
bool "Toolchain has C++ support?"
- select BR2_INSTALL_LIBSTDCPP
+ select BR2_TOOLCHAIN_HAS_CPP
help
Select this option if your external toolchain has C++
support. If you don't know, leave the default value,
diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk
index e589738..f397966 100644
--- a/toolchain/toolchain-external/ext-tool.mk
+++ b/toolchain/toolchain-external/ext-tool.mk
@@ -49,7 +49,7 @@ ifeq ($(BR2_TOOLCHAIN_EXTERNAL_GLIBC),y)
LIB_EXTERNAL_LIBS+=libnss_files.so libnss_dns.so
endif
-ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
+ifeq ($(BR2_TOOLCHAIN_HAS_CPP),y)
USR_LIB_EXTERNAL_LIBS+=libstdc++.so
endif
@@ -157,7 +157,7 @@ $(STAMP_DIR)/ext-toolchain-checked:
if test x$(BR2_arm) == x"y" ; then \
$(call check_arm_abi) ; \
fi ; \
- if test x$(BR2_INSTALL_LIBSTDCPP) == x"y" ; then \
+ if test x$(BR2_TOOLCHAIN_HAS_CPP) == x"y" ; then \
$(call check_cplusplus) ; \
fi ; \
if test x$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC) == x"y" ; then \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 9/9] Fix minor spacing/tabs issues in package/*/Config.in
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
` (7 preceding siblings ...)
2011-03-07 22:28 ` [Buildroot] [PATCH 8/9] Rename BR2_INSTALL_LIBSTDCPP to BR2_TOOLCHAIN_HAS_CPP Thomas Petazzoni
@ 2011-03-07 22:28 ` Thomas Petazzoni
2011-03-19 10:00 ` [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-07 22:28 UTC (permalink / raw)
To: buildroot
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
package/cramfs/Config.in | 10 +++++-----
package/diffutils/Config.in | 2 +-
package/expat/Config.in | 2 +-
package/genext2fs/Config.in | 14 +++++++-------
package/genromfs/Config.in | 8 ++++----
package/i2c-tools/Config.in | 14 +++++++-------
package/makedevs/Config.in | 8 ++++----
7 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/package/cramfs/Config.in b/package/cramfs/Config.in
index a5c73a8..daf6e6d 100644
--- a/package/cramfs/Config.in
+++ b/package/cramfs/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_CRAMFS
- bool "cramfs"
- help
- cramfs is a compressed read-only filesystem. This package
- contains the tools to generate and check a cramfs filesystem.
+ bool "cramfs"
+ help
+ cramfs is a compressed read-only filesystem. This package
+ contains the tools to generate and check a cramfs filesystem.
- http://sourceforge.net/projects/cramfs/
+ http://sourceforge.net/projects/cramfs/
diff --git a/package/diffutils/Config.in b/package/diffutils/Config.in
index df3e426..39e412f 100644
--- a/package/diffutils/Config.in
+++ b/package/diffutils/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_DIFFUTILS
- bool"diffutils"
+ bool "diffutils"
help
GNU diff. Compare files per line.
diff --git a/package/expat/Config.in b/package/expat/Config.in
index 3988c90..758fb7d 100644
--- a/package/expat/Config.in
+++ b/package/expat/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_EXPAT
- bool"expat"
+ bool "expat"
help
The Expat XML Parser.
diff --git a/package/genext2fs/Config.in b/package/genext2fs/Config.in
index 82992f8..02c12f4 100644
--- a/package/genext2fs/Config.in
+++ b/package/genext2fs/Config.in
@@ -1,9 +1,9 @@
config BR2_PACKAGE_GENEXT2FS
- bool "genext2fs"
- help
- genext2fs generates an ext2 filesystem as a normal (non-root)
- user. It does not require you to mount the image file to
- copy files on it, nor does it require that you become the
- superuser to make device nodes.
+ bool "genext2fs"
+ help
+ genext2fs generates an ext2 filesystem as a normal (non-root)
+ user. It does not require you to mount the image file to
+ copy files on it, nor does it require that you become the
+ superuser to make device nodes.
- http://genext2fs.sourceforge.net/
+ http://genext2fs.sourceforge.net/
diff --git a/package/genromfs/Config.in b/package/genromfs/Config.in
index 2caf2a4..7390f0a 100644
--- a/package/genromfs/Config.in
+++ b/package/genromfs/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_GENROMFS
- bool "genromfs"
- help
- Tool to generate a ROMFS filesystem.
+ bool "genromfs"
+ help
+ Tool to generate a ROMFS filesystem.
- http://romfs.sourceforge.net/
\ No newline at end of file
+ http://romfs.sourceforge.net/
\ No newline at end of file
diff --git a/package/i2c-tools/Config.in b/package/i2c-tools/Config.in
index 47d0642..6bd38b5 100644
--- a/package/i2c-tools/Config.in
+++ b/package/i2c-tools/Config.in
@@ -1,10 +1,10 @@
config BR2_PACKAGE_I2C_TOOLS
- bool "i2c-tools"
- help
- Heterogeneous set of I2C tools for Linux
+ bool "i2c-tools"
+ help
+ Heterogeneous set of I2C tools for Linux
- This package contains a heterogeneous set of I2C tools for Linux:
- a bus probing tool, a chip dumper, register-level access helpers,
- EEPROM decoding scripts, and more.
+ This package contains a heterogeneous set of I2C tools for
+ Linux: a bus probing tool, a chip dumper, register-level
+ access helpers, EEPROM decoding scripts, and more.
- http://www.lm-sensors.org
+ http://www.lm-sensors.org
diff --git a/package/makedevs/Config.in b/package/makedevs/Config.in
index 4f8c38d..b530889 100644
--- a/package/makedevs/Config.in
+++ b/package/makedevs/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_MAKEDEVS
- bool "makedevs"
- help
- The makedevs utility allows to create a set of device files
- according to a configuration file.
\ No newline at end of file
+ bool "makedevs"
+ help
+ The makedevs utility allows to create a set of device files
+ according to a configuration file.
\ No newline at end of file
--
1.7.0.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
` (8 preceding siblings ...)
2011-03-07 22:28 ` [Buildroot] [PATCH 9/9] Fix minor spacing/tabs issues in package/*/Config.in Thomas Petazzoni
@ 2011-03-19 10:00 ` Thomas Petazzoni
9 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-03-19 10:00 UTC (permalink / raw)
To: buildroot
Hello,
On Mon, 7 Mar 2011 23:28:33 +0100
Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> During the post-FOSDEM Buildroot Developer Day, we decided to clean up
> and clarify the name of the toolchain options concerning large file,
> IPv6, RPC, locale, program invocation, C++, etc. The goal is to have
> something more coherent and more meaningful, so all options are now
> named BR2_TOOLCHAIN_HAS_xxx.
>
> The last commit is just a cleanup patch that fixes tab or space issues
> in various Config.in files.
Ping ?
Thomas
--
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts
@ 2011-04-02 16:58 Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2011-04-02 16:58 UTC (permalink / raw)
To: buildroot
The following changes since commit 0a70aa0cc5d0980e72677869d9d87e0e4e35e483:
webkit: bump to version 1.2.7 (2011-03-31 15:23:13 +0200)
are available in the git repository at:
git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.05/rename-toolchain-config-opts
Thomas Petazzoni (9):
Rename BR2_LARGEFILE to BR2_TOOLCHAIN_HAS_LARGEFILE
Rename BR2_INET_IPV6 to BR2_TOOLCHAIN_HAS_IPV6
Rename BR2_INET_RPC to BR2_TOOLCHAIN_HAS_RPC
Rename BR2_USE_WCHAR to BR2_TOOLCHAIN_HAS_WCHAR
Rename BR2_ENABLE_LOCALE_{PURGE,WHITELIST} to BR2_LOCALE_{PURGE,WHITELIST}
Rename BR2_ENABLE_LOCALE to BR2_TOOLCHAIN_HAS_LOCALE
Rename BR2_PROGRAM_INVOCATION to BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION
Rename BR2_INSTALL_LIBSTDCPP to BR2_TOOLCHAIN_HAS_CPP
Fix minor spacing/tabs issues in package/*/Config.in
Makefile | 6 ++--
boot/grub/grub.mk | 2 +-
boot/grub2/grub2.mk | 2 +-
configs/arm_nptl_toolchain_defconfig | 12 +++---
configs/arm_toolchain_defconfig | 12 +++---
package/Makefile.in | 10 +++---
package/alsamixergui/Config.in | 4 +-
package/atk/Config.in | 4 +-
package/axel/axel.mk | 2 +-
package/bind/Config.in | 4 +-
package/bison/Config.in | 4 +-
package/blackbox/Config.in | 6 ++--
package/blackbox/blackbox.mk | 2 +-
package/bmon/Config.in | 4 +-
package/bootutils/Config.in | 4 +-
package/busybox/busybox.mk | 6 ++--
package/bzip2/bzip2.mk | 2 +-
package/cdrkit/Config.in | 4 +-
package/coreutils/Config.in | 4 +-
package/cramfs/Config.in | 10 +++---
package/ctorrent/Config.in | 4 +-
package/cups/Config.in | 4 +-
package/cvs/Config.in | 2 +-
package/dbus-glib/Config.in | 4 +-
package/dbus-python/Config.in | 4 +-
package/dialog/Config.in | 2 +-
package/dialog/dialog.mk | 2 +-
package/diffutils/Config.in | 2 +-
package/dmalloc/dmalloc.mk | 2 +-
package/dmraid/Config.in | 4 +-
package/dnsmasq/Config.in | 2 +-
package/dnsmasq/dnsmasq.mk | 4 +-
package/docker/Config.in | 4 +-
package/dosfstools/Config.in | 4 +-
package/e2fsprogs/Config.in | 4 +-
package/enchant/Config.in | 6 ++--
package/expat/Config.in | 2 +-
package/findutils/Config.in | 4 +-
package/fltk/Config.in | 4 +-
package/fuse/Config.in | 4 +-
package/gamin/Config.in | 4 +-
package/gamin/gamin.mk | 2 +-
package/gawk/Config.in | 2 +-
package/gdk-pixbuf/Config.in | 4 +-
package/gdk-pixbuf/gdk-pixbuf.mk | 4 +-
package/genext2fs/Config.in | 14 ++++----
package/genromfs/Config.in | 8 ++--
package/gettext/Config.in | 6 ++--
package/gmpc/Config.in | 6 ++--
package/gob2/Config.in | 4 +-
package/gperf/Config.in | 4 +-
package/gpsd/gpsd.mk | 2 +-
package/grep/Config.in | 4 +-
package/gvfs/Config.in | 6 ++--
package/hal/Config.in | 6 ++--
package/hdparm/Config.in | 4 +-
package/hostapd/hostapd.mk | 2 +-
package/i2c-tools/Config.in | 14 ++++----
package/icu/Config.in | 6 ++--
package/imagemagick/imagemagick.mk | 2 +-
package/iperf/Config.in | 4 +-
package/ipsec-tools/ipsec-tools.mk | 2 +-
package/iptables/Config.in | 4 +-
package/iptables/iptables.mk | 2 +-
package/kismet/Config.in | 4 +-
package/libarchive/Config.in | 4 +-
package/libcgicc/Config.in | 4 +-
package/libconfig/libconfig.mk | 2 +-
package/libdrm/Config.in | 4 +-
package/libelf/libelf.mk | 2 +-
package/libglade/Config.in | 4 +-
package/libglib2/Config.in | 6 ++--
package/libglib2/libglib2.mk | 4 +-
package/libgtk2/Config.in | 6 ++--
package/libiconv/Config.in | 2 +-
package/libiconv/libiconv.mk | 2 +-
package/librsvg/Config.in | 2 +-
package/libsigc/Config.in | 4 +-
package/libsoup/Config.in | 4 +-
package/libsoup/libsoup.mk | 2 +-
package/libupnp/Config.in | 4 +-
package/libxml2/libxml2.mk | 2 +-
package/lighttpd/lighttpd.mk | 2 +-
package/lmbench/Config.in | 4 +-
package/logrotate/Config.in | 4 +-
package/lsof/Config.in | 4 +-
package/lsof/lsof.mk | 8 ++--
package/luafilesystem/luafilesystem.mk | 2 +-
package/lvm2/Config.in | 4 +-
package/lzma/Config.in | 4 +-
package/m4/Config.in | 4 +-
package/m4/m4.mk | 2 +-
package/makedevs/Config.in | 8 ++--
package/memtester/Config.in | 4 +-
package/midori/Config.in | 6 ++--
package/mtd/Config.in | 4 +-
package/multimedia/alsa-utils/Config.in | 8 ++--
package/multimedia/festival/Config.in | 4 +-
package/multimedia/festival/speech-tools/Config.in | 4 +-
package/multimedia/ffmpeg/Config.in | 7 ++--
package/multimedia/gst-ffmpeg/Config.in | 7 ++--
package/multimedia/gst-plugins-bad/Config.in | 4 +-
package/multimedia/gst-plugins-base/Config.in | 4 +-
package/multimedia/gst-plugins-good/Config.in | 4 +-
package/multimedia/gstreamer/Config.in | 4 +-
package/multimedia/libdvdnav/Config.in | 4 +-
package/multimedia/libdvdread/Config.in | 4 +-
package/multimedia/libmms/Config.in | 4 +-
package/multimedia/libmpd/Config.in | 6 ++--
package/multimedia/mpd/Config.in | 12 +++---
package/multimedia/mplayer/mplayer.mk | 4 +-
package/multimedia/swfdec/Config.in | 6 ++--
package/multimedia/taglib/Config.in | 4 +-
package/multimedia/wavpack/Config.in | 2 +-
package/multimedia/wavpack/wavpack.mk | 2 +-
package/mutt/Config.in | 4 +-
package/mysql_client/Config.in | 4 +-
package/nbd/Config.in | 4 +-
package/nbd/nbd.mk | 2 +-
package/ncftp/Config.in | 4 +-
package/netkitbase/Config.in | 4 +-
package/netkittelnet/Config.in | 4 +-
package/netsnmp/netsnmp.mk | 2 +-
package/nfs-utils/Config.in | 6 ++--
package/ntfs-3g/Config.in | 6 ++--
package/ntfsprogs/Config.in | 6 ++--
package/ntp/ntp.mk | 2 +-
package/olsr/Config.in | 4 +-
package/oprofile/Config.in | 4 +-
package/pango/Config.in | 6 ++--
package/patch/Config.in | 4 +-
package/pcmanfm/Config.in | 4 +-
package/pcre/pcre.mk | 2 +-
package/php/Config.ext | 8 ++--
package/php/php.mk | 4 +-
package/pkg-config/Config.in | 4 +-
package/portmap/Config.in | 4 +-
package/pppd/pppd.mk | 2 +-
package/python/Config.in | 4 +-
package/qt/Config.in | 4 +-
package/qt/qt.mk | 4 +-
package/quagga/Config.in | 4 +-
package/radvd/Config.in | 2 +-
package/rpm/Config.in | 4 +-
package/rrdtool/Config.in | 4 +-
package/ruby/Config.in | 4 +-
package/samba/Config.in | 2 +-
package/samba/samba.mk | 4 +-
package/sdl_sound/Config.in | 2 +-
package/sdl_sound/sdl_sound.mk | 2 +-
package/sed/Config.in | 2 +-
package/sfdisk/sfdisk.mk | 2 +-
package/shared-mime-info/Config.in | 4 +-
package/smartmontools/Config.in | 4 +-
package/spawn-fcgi/spawn-fcgi.mk | 2 +-
package/sqlite/sqlite.mk | 2 +-
package/squashfs/Config.in | 4 +-
package/squashfs3/Config.in | 4 +-
package/squid/Config.in | 6 ++--
package/sshfs/Config.in | 8 ++--
package/sshfs/sshfs.mk | 2 +-
package/strace/strace.mk | 2 +-
package/synergy/Config.in | 6 ++--
package/sysklogd/Config.in | 4 +-
package/tar/Config.in | 4 +-
package/udev/udev.mk | 2 +-
package/udpcast/Config.in | 4 +-
package/usbutils/Config.in | 4 +-
package/util-linux/Config.in | 4 +-
package/webkit/Config.in | 6 ++--
package/wget/Config.in | 4 +-
package/wipe/wipe.mk | 2 +-
package/x11r7/Config.in | 8 ++--
package/x11r7/mesa3d/Config.in | 2 +-
package/x11r7/xlib_libpciaccess/Config.in | 4 +-
package/xerces/Config.in | 5 ++-
package/xfsprogs/Config.in | 4 +-
package/xmlstarlet/Config.in | 2 +-
target/xtensa/defconfig | 6 ++--
toolchain/dependencies/dependencies.sh | 2 +-
toolchain/gcc/Config.in | 4 +-
toolchain/gcc/gcc-uclibc-4.x.mk | 6 ++--
toolchain/gdb/Config.in | 4 +-
toolchain/gdb/gdb.mk | 2 +-
toolchain/helpers.mk | 24 ++++++------
toolchain/toolchain-buildroot/Config.in.2 | 14 ++++----
toolchain/toolchain-common.in | 22 ++++++------
toolchain/toolchain-crosstool-ng/Config.in | 38 ++++++++++----------
toolchain/toolchain-crosstool-ng/crosstool-ng.mk | 14 ++++----
toolchain/toolchain-external/Config.in | 38 ++++++++++----------
toolchain/toolchain-external/ext-tool.mk | 6 ++--
toolchain/uClibc/uclibc.mk | 12 +++---
192 files changed, 470 insertions(+), 467 deletions(-)
Thanks,
--
Thomas Petazzoni
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2011-04-02 16:58 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-07 22:28 [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 1/9] Rename BR2_LARGEFILE to BR2_TOOLCHAIN_HAS_LARGEFILE Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 2/9] Rename BR2_INET_IPV6 to BR2_TOOLCHAIN_HAS_IPV6 Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 3/9] Rename BR2_INET_RPC to BR2_TOOLCHAIN_HAS_RPC Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 4/9] Rename BR2_USE_WCHAR to BR2_TOOLCHAIN_HAS_WCHAR Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 5/9] Rename BR2_ENABLE_LOCALE_{PURGE, WHITELIST} to BR2_LOCALE_{PURGE, WHITELIST} Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 6/9] Rename BR2_ENABLE_LOCALE to BR2_TOOLCHAIN_HAS_LOCALE Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 7/9] Rename BR2_PROGRAM_INVOCATION to BR2_TOOLCHAIN_HAS_PROGRAM_INVOCATION Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 8/9] Rename BR2_INSTALL_LIBSTDCPP to BR2_TOOLCHAIN_HAS_CPP Thomas Petazzoni
2011-03-07 22:28 ` [Buildroot] [PATCH 9/9] Fix minor spacing/tabs issues in package/*/Config.in Thomas Petazzoni
2011-03-19 10:00 ` [Buildroot] [pull request] Pull request for branch for-2011.05/rename-toolchain-config-opts Thomas Petazzoni
-- strict thread matches above, loose matches on Subject: below --
2011-04-02 16:58 Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox