diff options
| -rw-r--r-- | package/bind/bind.mk | 2 | ||||
| -rw-r--r-- | package/iperf/iperf.mk | 2 | ||||
| -rw-r--r-- | package/ipsec-tools/Config.in | 2 | ||||
| -rw-r--r-- | package/ipsec-tools/ipsec-tools.mk | 8 | ||||
| -rw-r--r-- | package/lsof/lsof.mk | 2 | ||||
| -rw-r--r-- | package/python/python.mk | 8 | ||||
| -rw-r--r-- | package/qtopia4/qtopia4.mk | 4 |
7 files changed, 12 insertions, 16 deletions
diff --git a/package/bind/bind.mk b/package/bind/bind.mk index e1dc00a03..9fdd809f6 100644 --- a/package/bind/bind.mk +++ b/package/bind/bind.mk @@ -45,7 +45,7 @@ $(BIND_DIR2)/Makefile: $(BIND_DIR2)/.unpacked --localstatedir=/var \ --without-openssl \ --with-randomdev=/dev/random \ - --enable-ipv6 \ + $(DISABLE_IPV6) \ --with-libtool \ --with-pic \ ); diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 020ec76d4..f7f143b2f 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -29,7 +29,7 @@ $(IPERF_DIR)/.configured: $(IPERF_DIR)/.unpacked --target=$(GNU_TARGET_NAME) \ --host=$(GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ - --disable-ipv6 \ + $(DISABLE_IPV6) \ --disable-dependency-tracking \ --disable-web100 \ --prefix=/usr \ diff --git a/package/ipsec-tools/Config.in b/package/ipsec-tools/Config.in index e7a948905..f868c6bb0 100644 --- a/package/ipsec-tools/Config.in +++ b/package/ipsec-tools/Config.in @@ -44,7 +44,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_STATS config BR2_PACKAGE_IPSEC_TOOLS_IPV6 default y - depends on BR2_PACKAGE_IPSEC_TOOLS + depends on BR2_PACKAGE_IPSEC_TOOLS && BR2_INET_IPV6 bool "Enable IPv6 support" help This option has no effect if uClibc has been compiled without diff --git a/package/ipsec-tools/ipsec-tools.mk b/package/ipsec-tools/ipsec-tools.mk index d6b9c7bbe..52e53f25a 100644 --- a/package/ipsec-tools/ipsec-tools.mk +++ b/package/ipsec-tools/ipsec-tools.mk @@ -42,18 +42,16 @@ else IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats endif -# At first check, if uClibc supports IPv6 -ifeq ($(shell grep -qs '__UCLIBC_HAS_IPV6__ 1' \ - $(STAGING_DIR)/include/bits/uClibc_config.h && echo IPV6), IPV6) +ifeq ($(BR2_INET_IPV6),y) ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_IPV6)), y) IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6 else -IPSEC_TOOLS_CONFIG_FLAGS+= --disable-ipv6 +IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6) endif else # ignore user's choice if it doesn't -IPSEC_TOOLS_CONFIG_FLAGS+= --disable-ipv6 +IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6) endif ifneq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_READLINE)), y) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 6a60f8bcb..002a62918 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -15,7 +15,7 @@ BR2_LSOF_CFLAGS:= ifeq ($(BR2_LARGEFILE),) BR2_LSOF_CFLAGS+=-U_FILE_OFFSET_BITS endif -ifeq ($(UCLIBC_HAS_IPV6),) +ifeq ($(BR2_INET_IPV6),) BR2_LSOF_CFLAGS+=-UHASIPv6 endif diff --git a/package/python/python.mk b/package/python/python.mk index 01879cc0b..17d6a1452 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -11,12 +11,6 @@ PYTHON_CAT:=$(BZCAT) PYTHON_BINARY:=python PYTHON_TARGET_BINARY:=usr/bin/python -#ifndef BR2_SUPPORT_IPv6 -#PYTHON_DISABLE_IPv6=--disable-ipv6 -#else -#PYTHON_DISABLE_IPv6=--enable-ipv6 -#endif - # these could use checks for some BR2_PACKAGE_foo,y BR2_PYTHON_DISABLED_MODULES=readline pyexpat dbm gdbm bsddb \ _curses _curses_panel _tkinter nis zipfile @@ -58,7 +52,7 @@ $(PYTHON_DIR)/.configured: $(PYTHON_DIR)/.hostpython --prefix=/usr \ --sysconfdir=/etc \ --with-cxx=no \ - $(PYTHON_DISABLE_IPv6) \ + $(DISABLE_IPV6) \ $(DISABLE_NLS) \ ); touch $@ diff --git a/package/qtopia4/qtopia4.mk b/package/qtopia4/qtopia4.mk index e424e76c3..45ed5c8f2 100644 --- a/package/qtopia4/qtopia4.mk +++ b/package/qtopia4/qtopia4.mk @@ -112,8 +112,10 @@ $(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked # Patching configure to get rid of some feature I dont want. # (I don't want SQL either but there is no option for that at all. # the SQL library will be built even without the plugins/drivers. +ifneq ($(BR2_INET_IPV6),y) $(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_TARGET_DIR)/configure $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_TARGET_DIR)/configure +endif $(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_TARGET_DIR)/configure $(SED) 's/-O2/$(TARGET_CFLAGS)/' $(QTOPIA4_TARGET_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf -[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \ @@ -198,8 +200,10 @@ $(QTOPIA4_HOST_DIR)/.configured: $(QTOPIA4_HOST_DIR)/.unpacked # Patching configure to get rid of some feature I dont want. # (I don't want SQL either but there is no option for that at all. # the SQL library will be built even without the plugins/drivers. +ifneq ($(BR2_INET_IPV6),y) $(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_HOST_DIR)/configure $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(QTOPIA4_HOST_DIR)/configure +endif $(SED) 's/^CFG_XINERAMA=auto/CFG_XINERAMA=no/' $(QTOPIA4_HOST_DIR)/configure $(SED) 's/-O2/$(TARGET_CFLAGS)/' $(QTOPIA4_HOST_DIR)/mkspecs/qws/linux-$(BR2_PACKAGE_QTOPIA4_EMB_PLATFORM)-g++/qmake.conf -[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \ |