- use BR2_INET_IPV6
This commit is contained in:
parent
4ec94aed2e
commit
f203aaf7c0
|
@ -45,7 +45,7 @@ $(BIND_DIR2)/Makefile: $(BIND_DIR2)/.unpacked
|
||||||
--localstatedir=/var \
|
--localstatedir=/var \
|
||||||
--without-openssl \
|
--without-openssl \
|
||||||
--with-randomdev=/dev/random \
|
--with-randomdev=/dev/random \
|
||||||
--enable-ipv6 \
|
$(DISABLE_IPV6) \
|
||||||
--with-libtool \
|
--with-libtool \
|
||||||
--with-pic \
|
--with-pic \
|
||||||
);
|
);
|
||||||
|
|
|
@ -29,7 +29,7 @@ $(IPERF_DIR)/.configured: $(IPERF_DIR)/.unpacked
|
||||||
--target=$(GNU_TARGET_NAME) \
|
--target=$(GNU_TARGET_NAME) \
|
||||||
--host=$(GNU_TARGET_NAME) \
|
--host=$(GNU_TARGET_NAME) \
|
||||||
--build=$(GNU_HOST_NAME) \
|
--build=$(GNU_HOST_NAME) \
|
||||||
--disable-ipv6 \
|
$(DISABLE_IPV6) \
|
||||||
--disable-dependency-tracking \
|
--disable-dependency-tracking \
|
||||||
--disable-web100 \
|
--disable-web100 \
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
|
|
|
@ -44,7 +44,7 @@ config BR2_PACKAGE_IPSEC_TOOLS_STATS
|
||||||
|
|
||||||
config BR2_PACKAGE_IPSEC_TOOLS_IPV6
|
config BR2_PACKAGE_IPSEC_TOOLS_IPV6
|
||||||
default y
|
default y
|
||||||
depends on BR2_PACKAGE_IPSEC_TOOLS
|
depends on BR2_PACKAGE_IPSEC_TOOLS && BR2_INET_IPV6
|
||||||
bool "Enable IPv6 support"
|
bool "Enable IPv6 support"
|
||||||
help
|
help
|
||||||
This option has no effect if uClibc has been compiled without
|
This option has no effect if uClibc has been compiled without
|
||||||
|
|
|
@ -42,18 +42,16 @@ else
|
||||||
IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats
|
IPSEC_TOOLS_CONFIG_FLAGS+= --disable-stats
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# At first check, if uClibc supports IPv6
|
ifeq ($(BR2_INET_IPV6),y)
|
||||||
ifeq ($(shell grep -qs '__UCLIBC_HAS_IPV6__ 1' \
|
|
||||||
$(STAGING_DIR)/include/bits/uClibc_config.h && echo IPV6), IPV6)
|
|
||||||
|
|
||||||
ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_IPV6)), y)
|
ifeq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_IPV6)), y)
|
||||||
IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6
|
IPSEC_TOOLS_CONFIG_FLAGS+= --enable-ipv6
|
||||||
else
|
else
|
||||||
IPSEC_TOOLS_CONFIG_FLAGS+= --disable-ipv6
|
IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
else # ignore user's choice if it doesn't
|
else # ignore user's choice if it doesn't
|
||||||
IPSEC_TOOLS_CONFIG_FLAGS+= --disable-ipv6
|
IPSEC_TOOLS_CONFIG_FLAGS+= $(DISABLE_IPV6)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_READLINE)), y)
|
ifneq ($(strip $(BR2_PACKAGE_IPSEC_TOOLS_READLINE)), y)
|
||||||
|
|
|
@ -15,7 +15,7 @@ BR2_LSOF_CFLAGS:=
|
||||||
ifeq ($(BR2_LARGEFILE),)
|
ifeq ($(BR2_LARGEFILE),)
|
||||||
BR2_LSOF_CFLAGS+=-U_FILE_OFFSET_BITS
|
BR2_LSOF_CFLAGS+=-U_FILE_OFFSET_BITS
|
||||||
endif
|
endif
|
||||||
ifeq ($(UCLIBC_HAS_IPV6),)
|
ifeq ($(BR2_INET_IPV6),)
|
||||||
BR2_LSOF_CFLAGS+=-UHASIPv6
|
BR2_LSOF_CFLAGS+=-UHASIPv6
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -11,12 +11,6 @@ PYTHON_CAT:=$(BZCAT)
|
||||||
PYTHON_BINARY:=python
|
PYTHON_BINARY:=python
|
||||||
PYTHON_TARGET_BINARY:=usr/bin/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
|
# these could use checks for some BR2_PACKAGE_foo,y
|
||||||
BR2_PYTHON_DISABLED_MODULES=readline pyexpat dbm gdbm bsddb \
|
BR2_PYTHON_DISABLED_MODULES=readline pyexpat dbm gdbm bsddb \
|
||||||
_curses _curses_panel _tkinter nis zipfile
|
_curses _curses_panel _tkinter nis zipfile
|
||||||
|
@ -58,7 +52,7 @@ $(PYTHON_DIR)/.configured: $(PYTHON_DIR)/.hostpython
|
||||||
--prefix=/usr \
|
--prefix=/usr \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--with-cxx=no \
|
--with-cxx=no \
|
||||||
$(PYTHON_DISABLE_IPv6) \
|
$(DISABLE_IPV6) \
|
||||||
$(DISABLE_NLS) \
|
$(DISABLE_NLS) \
|
||||||
);
|
);
|
||||||
touch $@
|
touch $@
|
||||||
|
|
|
@ -112,8 +112,10 @@ $(QTOPIA4_TARGET_DIR)/.configured: $(QTOPIA4_TARGET_DIR)/.unpacked
|
||||||
# Patching configure to get rid of some feature I dont want.
|
# 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.
|
# (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.
|
# 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_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_TARGET_DIR)/configure
|
||||||
$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=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/^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
|
$(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) \
|
-[ -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.
|
# 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.
|
# (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.
|
# 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_IPV6=auto/CFG_IPV6=no/' $(QTOPIA4_HOST_DIR)/configure
|
||||||
$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=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/^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
|
$(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) \
|
-[ -f $(QTOPIA4_QCONFIG_FILE) ] && cp $(QTOPIA4_QCONFIG_FILE) \
|
||||||
|
|
Loading…
Reference in New Issue
Block a user