diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-06-26 16:34:45 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2007-06-26 16:34:45 +0000 |
| commit | a48d8f5414d9f6f7a861aa2a6e18f8b48610910a (patch) | |
| tree | 846a6ad233c7bd3250c7b4e891794add598e8646 | |
| parent | 23f59c69c525cb7e0b3d386339fcc9c10505aba2 (diff) | |
- 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
| -rw-r--r-- | package/Makefile.in | 4 | ||||
| -rw-r--r-- | toolchain/Config.in.2 | 12 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 19 |
3 files changed, 34 insertions, 1 deletions
diff --git a/package/Makefile.in b/package/Makefile.in index 6b1e6fe19..f0f4c7b74 100644 --- 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 b9f1c3217..b3da69038 100644 --- 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 d350ace43..f5d2bf48b 100644 --- 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 |