- add BR2_INET_IPV6 and BR2_INET_RPC

  TODO: use $(DISABLE_IPV6) in packages instead of a gazillion different hackish ways that are currently in there

diff --git a/package/Makefile.in b/package/Makefile.in
index 6b1e6fe194994ab582c8e99245b80e55a5e4b190..f0f4c7b7463ae6c33ad1e1a4a621f51ee7a42922 100644 (file)
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -198,6 +198,10 @@ ifneq ($(BR2_LARGEFILE),y)
 DISABLE_LARGEFILE= --disable-largefile
 endif
 
+ifneq ($(BR2_INET_IPV6),y)
+DISABLE_IPV6= --disable-ipv6
+endif
+
 ifeq ($(BR2_INSTALL_LIBSTDCPP),)
 TARGET_CONFIGURE_OPTS+=CXX=""
 endif

diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2
index b9f1c32172ca9f24c8baed4f65790bc27d28956e..b3da690387dc097090fde125970af08c43cac6c4 100644 (file)
--- a/toolchain/Config.in.2
+++ b/toolchain/Config.in.2
@@ -29,6 +29,18 @@ config BR2_LARGEFILE
        help
            Enable large file (files > 2 GB) support
 
+config BR2_INET_IPV6
+       bool "Enable IPv6"
+       default n
+       help
+           Enable IPv6.
+
+config BR2_INET_RPC
+       bool "Enable RPC"
+       default n
+       help
+           Enable RPC. RPC support is needed for nfs.
+
 config BR2_SOFT_FLOAT
        bool "Use software floating point by default"
        default n

diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk
index d350ace433b4b8c8539fb8b5c87a2143a0f11c73..f5d2bf48b6a435c483819b6a3d479997ce1c67fb 100644 (file)
--- a/toolchain/uClibc/uclibc.mk
+++ b/toolchain/uClibc/uclibc.mk
@@ -142,7 +142,22 @@ else
        $(SED) '/.*UCLIBC_HAS_FOPEN_LARGEFILE_MODE.*/d' $(UCLIBC_DIR)/.config
        echo "# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set" >> $(UCLIBC_DIR)/.config
 endif
-       $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
+ifeq ($(BR2_INET_IPV6),y)
+       $(SED) 's.^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=y,g' $(UCLIBC_DIR)/.config
+else
+       $(SED) 's.^.*UCLIBC_HAS_IPV6.*,UCLIBC_HAS_IPV6=n,g' $(UCLIBC_DIR)/.config
+endif
+ifeq ($(BR2_INET_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'
+               $(UCLIBC_DIR)/.config
+else
+       $(SED) 's.^.*UCLIBC_HAS_RPC.*,UCLIBC_HAS_RPC=n,g' \
+               -e 's.^.*UCLIBC_HAS_FULL_RPC.*,UCLIBC_HAS_FULL_RPC=n,g' \
+               -e 's.^.*UCLIBC_HAS_REENTRANT_RPC.*,UCLIBC_HAS_REENTRANT_RPC=n,g'
+               $(UCLIBC_DIR)/.config
+endif
 ifeq ($(BR2_SOFT_FLOAT),y)
        $(SED) 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=n,g' \
                -e 's,^[^_]*HAS_FPU.*,HAS_FPU=n,g' \
@@ -187,8 +202,10 @@ else
 endif
 ifeq ($(BR2_ENABLE_LOCALE),y)
        $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=y\nUCLIBC_PREGENERATED_LOCALE_DATA=y\nUCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA=y\nUCLIBC_HAS_XLOCALE=y\nUCLIBC_HAS_GLIBC_DIGIT_GROUPING=n\n,g' $(UCLIBC_DIR)/.config
+       $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y,g' $(UCLIBC_DIR)/.config
 else
        $(SED) 's,^.*UCLIBC_HAS_LOCALE.*,UCLIBC_HAS_LOCALE=n,g' $(UCLIBC_DIR)/.config
+       $(SED) 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=n,g' $(UCLIBC_DIR)/.config
 endif
 ifeq ("$(KERNEL_ARCH)","i386")
        /bin/echo "# CONFIG_GENERIC_386 is not set" >> $(UCLIBC_DIR)/.config