packages: remove non-IPv6 dependencies and tweaks

Now that IPv6 is mandatory remove package dependencies and conditionals
for it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
index bd67bac8db5756db94cd1cb452516ed4c72c5400..4a0d20d71dbeb2ab61510abc328009749c30ea79 100644 (file)
--- a/package/aiccu/Config.in
+++ b/package/aiccu/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_AICCU
        bool "aiccu"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
@@ -22,8 +21,8 @@ config BR2_PACKAGE_AICCU
 
          http://www.sixxs.net/tools/aiccu/
 
-comment "aiccu needs a toolchain w/ IPv6, wchar, threads"
+comment "aiccu needs a toolchain w/ wchar, threads"
        depends on BR2_USE_MMU
-       depends on !(BR2_INET_IPV6 && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+       depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

diff --git a/package/argus/Config.in b/package/argus/Config.in
index 6d477346f75ee1074ac519364283c40236751636..7a7d2b650f0946da19add535ce2b01b2e3afa1c8 100644 (file)
--- a/package/argus/Config.in
+++ b/package/argus/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_ARGUS
        bool "argus"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_LIBPCAP
@@ -10,6 +9,6 @@ config BR2_PACKAGE_ARGUS
 
          http://qosient.com/argus/
 
-comment "argus needs a toolchain w/ threads, IPv6"
-       depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6)
+comment "argus needs a toolchain w/ threads"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU

diff --git a/package/atftp/Config.in b/package/atftp/Config.in
index 2a3df760b1a102710c8c9d6195f974890ff8912a..70747163708794e4f0133b373cf12dc414572848 100644 (file)
--- a/package/atftp/Config.in
+++ b/package/atftp/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_ATFTP
        bool "atftp"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        help
          atftp is a client/server implementation of the TFTP
@@ -11,5 +10,5 @@ config BR2_PACKAGE_ATFTP
 
          http://sourceforge.net/projects/atftp/
 
-comment "atftp needs a toolchain w/ threads, IPv6"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
+comment "atftp needs a toolchain w/ threads"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/batctl/Config.in b/package/batctl/Config.in
index a60f4f6add4f89e6cce3f2a4099362f9e0daff09..25574189282b636cfce72c86eb98a28086b59f24 100644 (file)
--- a/package/batctl/Config.in
+++ b/package/batctl/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_BATCTL
        bool "batctl"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
        select BR2_PACKAGE_LIBNL
        help
@@ -8,5 +7,5 @@ config BR2_PACKAGE_BATCTL
 
          http://www.open-mesh.org/projects/batman-adv/wiki/Using-batctl
 
-comment "batctl needs a toolchain w/ IPv6, threads"
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+comment "batctl needs a toolchain w/ threads"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/bind/Config.in b/package/bind/Config.in
index 95bbab1adbef60428e0cabb2629e53012cfe52f1..d7588845914edff5ae5be97c2b34457c592a1568 100644 (file)
--- a/package/bind/Config.in
+++ b/package/bind/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_BIND
        bool "bind"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_MMU # fork()
        depends on !BR2_STATIC_LIBS
        help
@@ -38,6 +37,6 @@ config BR2_PACKAGE_BIND_TOOLS
 
 endif
 
-comment "bind needs a toolchain w/ IPv6, dynamic library"
+comment "bind needs a toolchain w/ dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || BR2_STATIC_LIBS
+       depends on BR2_STATIC_LIBS

diff --git a/package/bluez5_utils/Config.in b/package/bluez5_utils/Config.in
index 8841649872a13da00eb194ec047ef196209752b1..013182208de902fd43e031e7a6217cf0575df328 100644 (file)
--- a/package/bluez5_utils/Config.in
+++ b/package/bluez5_utils/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_BLUEZ5_UTILS
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus
-       depends on BR2_INET_IPV6
        depends on !BR2_STATIC_LIBS # uses dlfcn
        depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
@@ -62,10 +61,9 @@ config BR2_PACKAGE_BLUEZ5_UTILS_TEST
 
 endif
 
-comment "bluez5-utils needs a toolchain w/ wchar, threads, IPv6, headers >= 3.4, dynamic library"
+comment "bluez5-utils needs a toolchain w/ wchar, threads, headers >= 3.4, dynamic library"
        depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
-               !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || \
-               BR2_STATIC_LIBS
+               !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS
        depends on BR2_USE_MMU
 
 comment "bluez5-utils conflicts with older bluez-utils version"

diff --git a/package/chrony/chrony.mk b/package/chrony/chrony.mk
index de80b52362e02cf26d31e3477714bb2f1d3f9950..8e41ddcf2ec611ec41750a0c74dbfa89e2fcdd54 100644 (file)
--- a/package/chrony/chrony.mk
+++ b/package/chrony/chrony.mk
@@ -23,10 +23,6 @@ else
 CHRONY_CONF_OPTS += --disable-readline
 endif
 
-ifneq ($(BR2_INET_IPV6),y)
-CHRONY_CONF_OPTS += --disable-ipv6
-endif
-
 # Ditch the doc build, needs makeinfo and we don't need them
 define CHRONY_DISABLE_DOCS
        $(SED) 's/chronyc chrony.txt/chronyc/' $(@D)/Makefile.in

diff --git a/package/civetweb/civetweb.mk b/package/civetweb/civetweb.mk
index c688f0dba15d47020d3ed2daa4c75f7d8df2f2b0..048c91ff4c13a9cea981d9c8a4389c3c5cc5361a 100644 (file)
--- a/package/civetweb/civetweb.mk
+++ b/package/civetweb/civetweb.mk
@@ -9,16 +9,12 @@ CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION))
 CIVETWEB_LICENSE = MIT
 CIVETWEB_LICENSE_FILES = LICENSE.md
 
-CIVETWEB_CONF_OPTS = TARGET_OS=LINUX
+CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1
 CIVETWEB_COPT = $(TARGET_CFLAGS) -DHAVE_POSIX_FALLOCATE=0
 CIVETWEB_LIBS = -lpthread -lm -ldl
 CIVETWEB_SYSCONFDIR = /etc
 CIVETWEB_HTMLDIR = /var/www
 
-ifeq ($(BR2_INET_IPV6),y)
-CIVETWEB_CONF_OPTS += WITH_IPV6=1
-endif
-
 ifeq ($(BR2_CIVETWEB_WITH_LUA),y)
 CIVETWEB_CONF_OPTS += WITH_LUA=1
 endif

diff --git a/package/classpath/Config.in b/package/classpath/Config.in
index a11845c75ebe7cc6b5e7a472fbbd57f0470ae4e7..ce711603071f047946cdb510247b6e6ce2dad9df 100644 (file)
--- a/package/classpath/Config.in
+++ b/package/classpath/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CLASSPATH
        select BR2_NEEDS_HOST_JAR
        select BR2_NEEDS_HOST_JAVAC
        depends on BR2_PACKAGE_JAMVM
-       depends on BR2_INET_IPV6
        help
          GNU Classpath, Essential Libraries for Java, is a GNU
          project to create free core class libraries for use with
@@ -11,7 +10,3 @@ config BR2_PACKAGE_CLASSPATH
          language.
 
          http://classpath.org
-
-comment "classpath needs a toolchain w/ IPv6"
-       depends on BR2_PACKAGE_JAMVM
-       depends on !BR2_INET_IPV6

diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 98eb51eefb28c840e8540b9ed378fa6338eb0414..ba290c35a09521831cc89c7f5edfca7795999319 100644 (file)
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_COLLECTD
        bool "collectd"
        # Uses fork()
        depends on BR2_USE_MMU
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on !BR2_STATIC_LIBS
        help
@@ -305,7 +304,6 @@ config BR2_PACKAGE_COLLECTD_OPENVPN
 
 config BR2_PACKAGE_COLLECTD_PING
        bool "ping"
-       depends on BR2_INET_IPV6
        select BR2_PACKAGE_LIBOPING
        help
          Mesures network latency using ICMP "echo requests".
@@ -446,7 +444,6 @@ config BR2_PACKAGE_COLLECTD_GRAPHITE
 
 config BR2_PACKAGE_COLLECTD_NETWORK
        bool "network"
-       depends on BR2_INET_IPV6
        help
          Send/receive values from other instances of collectd.
 
@@ -489,6 +486,6 @@ endmenu
 
 endif
 
-comment "collectd needs a toolchain w/ IPv6, threads, dynamic library"
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_STATIC_LIBS
+comment "collectd needs a toolchain w/ threads, dynamic library"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
        depends on BR2_USE_MMU

diff --git a/package/connman/Config.in b/package/connman/Config.in
index 39a8ed4327e759566c35aa18ca7ecc634fa82495..a887c2fba24aceb46e1bf4f294fe870e92576d5f 100644 (file)
--- a/package/connman/Config.in
+++ b/package/connman/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_CONNMAN
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_IPTABLES
        depends on BR2_USE_WCHAR # libglib2
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus, libglib2
        depends on !BR2_STATIC_LIBS # needs dlopen()
@@ -64,6 +63,6 @@ config BR2_PACKAGE_CONNMAN_CLIENT
 
 endif # BR2_PACKAGE_CONNMAN
 
-comment "connman needs a toolchain w/ IPv6, wchar, threads, resolver, dynamic library"
+comment "connman needs a toolchain w/ wchar, threads, resolver, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in
index a928352ad6b327accd40a2ef060ff7e544cdb6b9..84d3fd467dbf02e42f4b9b378a34c3a1b1690b33 100644 (file)
--- a/package/conntrack-tools/Config.in
+++ b/package/conntrack-tools/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_CONNTRACK_TOOLS
        bool "conntrack-tools"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc
        select BR2_PACKAGE_LIBNETFILTER_CONNTRACK
@@ -16,7 +15,6 @@ config BR2_PACKAGE_CONNTRACK_TOOLS
 
          http://www.netfilter.org/projects/conntrack-tools/
 
-comment "conntrack-tools needs a toolchain w/ IPv6, threads"
+comment "conntrack-tools needs a toolchain w/ threads"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || \
-               !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)
+       depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC)

diff --git a/package/cppzmq/Config.in b/package/cppzmq/Config.in
index d06490147fc183dc1afbb86c84fd07534beb9156..788fd0b59d9c0fbfca98993405243c9126f9a64d 100644 (file)
--- a/package/cppzmq/Config.in
+++ b/package/cppzmq/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_CPPZMQ
        bool "cppzmq"
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_INET_IPV6 # zeromq
        depends on BR2_USE_WCHAR # util-linux
        depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
        select BR2_PACKAGE_ZEROMQ
@@ -10,6 +9,6 @@ config BR2_PACKAGE_CPPZMQ
 
          http://github.com/zeromq/cppzmq
 
-comment "cppzmq needs a toolchain w/ C++, IPv6, wchar, threads"
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \
-               BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "cppzmq needs a toolchain w/ C++, wchar, threads"
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+               BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/czmq/Config.in b/package/czmq/Config.in
index 66c04373e79536329faf27cd00daa7197a20f185..6a99336b3b987a6a303c79a6b473c11396c979e2 100644 (file)
--- a/package/czmq/Config.in
+++ b/package/czmq/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_CZMQ
        select BR2_PACKAGE_ZEROMQ
        depends on BR2_USE_MMU # fork()
        depends on BR2_INSTALL_LIBSTDCPP # zeromq
-       depends on BR2_INET_IPV6 # zeromq
        depends on BR2_USE_WCHAR # util-linux
        depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
        help
@@ -11,7 +10,7 @@ config BR2_PACKAGE_CZMQ
 
          http://czmq.zeromq.org/
 
-comment "czmq needs a toolchain w/ C++, IPv6, wchar, threads"
+comment "czmq needs a toolchain w/ C++, wchar, threads"
        depends on BR2_USE_MMU
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \
-               BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+               BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/dhcp/dhcp.mk b/package/dhcp/dhcp.mk
index e6465eda8a31332c0fce4aefb2b130b0b470e789..c0d45882250a415196cf82b54d36e3c2a254cfdc 100644 (file)
--- a/package/dhcp/dhcp.mk
+++ b/package/dhcp/dhcp.mk
@@ -31,10 +31,6 @@ ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y)
 DHCP_CONF_OPTS += --enable-delayed-ack
 endif
 
-ifneq ($(BR2_INET_IPV6),y)
-DHCP_CONF_OPTS += --disable-dhcpv6
-endif
-
 ifeq ($(BR2_PACKAGE_DHCP_SERVER),y)
 define DHCP_INSTALL_SERVER
        mkdir -p $(TARGET_DIR)/var/lib

diff --git a/package/dhcpcd/dhcpcd.mk b/package/dhcpcd/dhcpcd.mk
index 694bb75a8b01fa5ad879ec90a3086f7e7cf1e6ed..405635197e572b461a61df0ac6ac7f6c26806960 100644 (file)
--- a/package/dhcpcd/dhcpcd.mk
+++ b/package/dhcpcd/dhcpcd.mk
@@ -10,10 +10,6 @@ DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
 DHCPCD_DEPENDENCIES = host-pkgconf
 DHCPCD_LICENSE = BSD-2c
 
-ifeq ($(BR2_INET_IPV6),)
-DHCPCD_CONFIG_OPTS += --disable-ipv6
-endif
-
 ifeq ($(BR2_STATIC_LIBS),y)
 DHCPCD_CONFIG_OPTS += --enable-static
 endif

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 3b0559008969f3051a587ed09de084c9cb80eed1..4b0999b3badc2c10017e5565820a9cb0ea1d6a5e 100644 (file)
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -14,10 +14,6 @@ DNSMASQ_DEPENDENCIES = host-pkgconf
 DNSMASQ_LICENSE = Dual GPLv2/GPLv3
 DNSMASQ_LICENSE_FILES = COPYING COPYING-v3
 
-ifneq ($(BR2_INET_IPV6),y)
-DNSMASQ_COPTS += -DNO_IPV6
-endif
-
 ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y)
 DNSMASQ_COPTS += -DNO_DHCP
 endif

diff --git a/package/dovecot/Config.in b/package/dovecot/Config.in
index fedc4d96b7519a0f5f36601e2dc48eb62d8fece0..5fd1714cf87b350a15bbd2de77afd5eda04716fc 100644 (file)
--- a/package/dovecot/Config.in
+++ b/package/dovecot/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_DOVECOT
        bool "dovecot"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_MMU # fork()
        help
          Dovecot is an open source IMAP and POP3 email server for Linux/UNIX-
@@ -52,7 +51,3 @@ config BR2_PACKAGE_DOVECOT_ZLIB
 source package/dovecot-pigeonhole/Config.in
 
 endif # BR2_PACKAGE_DOVECOT
-
-comment "dovecot needs a toolchain w/ IPv6"
-       depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6

diff --git a/package/ebtables/Config.in b/package/ebtables/Config.in
index 3a678ad097e4150114659800d595067ee5c9ea4f..18fff2450dd7405b0f3563e66638332a7c1a1a0e 100644 (file)
--- a/package/ebtables/Config.in
+++ b/package/ebtables/Config.in
@@ -1,12 +1,7 @@
 config BR2_PACKAGE_EBTABLES
        bool "ebtables"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_MMU # fork()
        help
          Ethernet bridge frame table administration
 
          http://ebtables.sourceforge.net
-
-comment "ebtables needs a toolchain w/ IPv6"
-       depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6

diff --git a/package/ffmpeg/Config.in b/package/ffmpeg/Config.in
index bfdc624ddabeb4849ced483807757363cf75499b..00163ba2732e77593561633a930d878b7fe8e0c5 100644 (file)
--- a/package/ffmpeg/Config.in
+++ b/package/ffmpeg/Config.in
@@ -1,11 +1,5 @@
-comment "ffmpeg needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
-       depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
-
 menuconfig BR2_PACKAGE_FFMPEG
        bool "ffmpeg"
-       depends on BR2_INET_IPV6
        # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405

diff --git a/package/filemq/Config.in b/package/filemq/Config.in
index 4015b92a3027cc8b937657b8e31e3769bd9cd6d1..4460f87cef5a7d2ea38d98fdb67bcf50a77db33a 100644 (file)
--- a/package/filemq/Config.in
+++ b/package/filemq/Config.in
@@ -4,7 +4,6 @@ config BR2_PACKAGE_FILEMQ
        select BR2_PACKAGE_CZMQ
        select BR2_PACKAGE_ZEROMQ
        depends on BR2_INSTALL_LIBSTDCPP # zeromq
-       depends on BR2_INET_IPV6 # zeromq
        depends on BR2_USE_WCHAR # util-linux
        depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
        depends on BR2_USE_MMU # czmq
@@ -13,7 +12,7 @@ config BR2_PACKAGE_FILEMQ
 
          http://github.com/zeromq/filemq
 
-comment "filemq needs a toolchain w/ C++, IPv6, wchar, threads"
+comment "filemq needs a toolchain w/ C++, wchar, threads"
        depends on BR2_USE_MMU
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \
-               BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+               BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in
index a33deeb51ce4f6be25c15e30134fb4956c958ab9..752a50b2da0cbfa8595a2b9d20bd9a508ed31dd2 100644 (file)
--- a/package/gnuradio/Config.in
+++ b/package/gnuradio/Config.in
@@ -1,12 +1,10 @@
-comment "gnuradio needs a toolchain w/ C++, IPV6, NPTL, wchar, dynamic library"
+comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library"
        depends on BR2_USE_MMU
        depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \
-               !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INET_IPV6 || \
-               BR2_STATIC_LIBS
+               !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS
 
 config BR2_PACKAGE_GNURADIO
        bool "gnuradio"
-       depends on BR2_INET_IPV6 # boost
        depends on BR2_INSTALL_LIBSTDCPP
        depends on !BR2_STATIC_LIBS
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL

diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk
index 47c07f99d846c206d8d7bad57fb707dccd0826cd..b99cacbf692a9aabe397c0461e460153c4617663 100644 (file)
--- a/package/gnutls/gnutls.mk
+++ b/package/gnutls/gnutls.mk
@@ -22,7 +22,7 @@ GNUTLS_CONF_OPTS = \
        --disable-doc \
        --disable-guile \
        --enable-local-libopts
-GNUTLS_CONF_ENV = gl_cv_socket_ipv6=$(if $(BR2_INET_IPV6),yes,no) \
+GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \
        ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \
        gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \
        gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no) \

diff --git a/package/gpsd/gpsd.mk b/package/gpsd/gpsd.mk
index 9623d756b86df856d1db32fd9ec34008efc042f2..1bf44157dd4fa7477898607ff51a4fd4fcaed353 100644 (file)
--- a/package/gpsd/gpsd.mk
+++ b/package/gpsd/gpsd.mk
@@ -29,11 +29,6 @@ else
 GPSD_SCONS_OPTS += ncurses=no
 endif
 
-# Disable IPv6, if we don't support it
-ifneq ($(BR2_INET_IPV6),y)
-GPSD_SCONS_OPTS += ipv6=no
-endif
-
 # Build libgpsmm if we've got C++
 ifeq ($(BR2_INSTALL_LIBSTDCPP),y)
 GPSD_LDFLAGS += -lstdc++

diff --git a/package/gstreamer/gst-ffmpeg/Config.in b/package/gstreamer/gst-ffmpeg/Config.in
index fc2906f5872884d28720f27711ace769df75eacc..c89070ffb9257e4ce62c69cf25270fe0521b5391 100644 (file)
--- a/package/gstreamer/gst-ffmpeg/Config.in
+++ b/package/gstreamer/gst-ffmpeg/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_GST_FFMPEG
        bool "gst-ffmpeg"
        select BR2_PACKAGE_GST_PLUGINS_BASE
-       depends on BR2_INET_IPV6
        help
          GStreamer plugin containing one plugin with a set of elements using
          the Libav library.  It contains most popular decoders as well as
@@ -21,6 +20,3 @@ config BR2_PACKAGE_GST_FFMPEG_GPL
          be under GPL.
 
 endif
-
-comment "gst-ffmpeg needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6

diff --git a/package/gstreamer/gst-plugins-good/Config.in b/package/gstreamer/gst-plugins-good/Config.in
index 6fb1a84c54eb2541b54a40b53e4a397910c2830c..70ae9c17960f9e6808853b0458f8e6979e114beb 100644 (file)
--- a/package/gstreamer/gst-plugins-good/Config.in
+++ b/package/gstreamer/gst-plugins-good/Config.in
@@ -139,12 +139,8 @@ config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM
        bool "spectrum"
 
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP
-       depends on BR2_INET_IPV6
        bool "udp"
 
-comment "udp needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX
        bool "videobox"
 

diff --git a/package/hiawatha/hiawatha.mk b/package/hiawatha/hiawatha.mk
index 76619e0e17d28e460fde1e4043be105e22ddf3cb..91c972ddd748a85531a4bae7a12df44a702fab3f 100644 (file)
--- a/package/hiawatha/hiawatha.mk
+++ b/package/hiawatha/hiawatha.mk
@@ -17,7 +17,6 @@ HIAWATHA_CONF_OPTS += -DENABLE_SSL=OFF
 endif
 
 HIAWATHA_CONF_OPTS += \
-       $(if $(BR2_INET_IPV6),,-DENABLE_IPV6=OFF) \
        -DENABLE_TOOLKIT=OFF \
        -DENABLE_XSLT=OFF \
        -DCONFIG_DIR=/etc/hiawatha \

diff --git a/package/hostapd/hostapd.mk b/package/hostapd/hostapd.mk
index a933d79d712a708c31087900da1edfbf26bb55b2..1ad32a24655c54d3547c30d504afb786c547e24b 100644 (file)
--- a/package/hostapd/hostapd.mk
+++ b/package/hostapd/hostapd.mk
@@ -35,10 +35,6 @@ ifeq ($(BR2_STATIC_LIBS),y)
 HOSTAPD_LIBS += -lnl-3 -lm -lpthread
 endif
 
-ifeq ($(BR2_INET_IPV6),)
-HOSTAPD_CONFIG_DISABLE += CONFIG_IPV6
-endif
-
 # Try to use openssl if it's already available
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 HOSTAPD_DEPENDENCIES += openssl

diff --git a/package/iftop/Config.in b/package/iftop/Config.in
index eb40a3001645232ea8766af2cf47b8e5a56bd066..8c6ae0caaf0371d8f67d1ad60d89294738b8b691 100644 (file)
--- a/package/iftop/Config.in
+++ b/package/iftop/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_IFTOP
        bool "iftop"
        select BR2_PACKAGE_NCURSES
        select BR2_PACKAGE_LIBPCAP
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        help
          iftop does for network usage what top(1) does for CPU usage.
@@ -12,5 +11,5 @@ config BR2_PACKAGE_IFTOP
 
          http://www.ex-parrot.com/pdw/iftop/
 
-comment "iftop needs a toolchain w/ IPv6, threads"
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+comment "iftop needs a toolchain w/ threads"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index 38faa6899520c180042f8d880155a72e711ab5f4..e425ec6f4ac43c4038051e1acacb7da9bf88c944 100644 (file)
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -40,16 +40,8 @@ define IPTABLES_TARGET_IPV6_SYMLINK_CREATE
        ln -sf xtables-multi $(TARGET_DIR)/usr/sbin/ip6tables-restore
 endef
 
-define IPTABLES_TARGET_IPV6_REMOVE
-       rm -f $(TARGET_DIR)/usr/lib/libip6tc.*
-endef
-
 IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_SYMLINK_CREATE
 
-ifeq ($(BR2_INET_IPV6),y)
 IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_SYMLINK_CREATE
-else
-IPTABLES_POST_INSTALL_TARGET_HOOKS += IPTABLES_TARGET_IPV6_REMOVE
-endif
 
 $(eval $(autotools-package))

diff --git a/package/iptraf-ng/Config.in b/package/iptraf-ng/Config.in
index 64e19d257662554259c6ea14ff45b90b7d57efbf..5574cfa9a5d2799a7105fc1f718a6305b61eaa63 100644 (file)
--- a/package/iptraf-ng/Config.in
+++ b/package/iptraf-ng/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_IPTRAF_NG
        depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_NCURSES
        select BR2_PACKAGE_NCURSES_TARGET_PANEL
-       depends on BR2_INET_IPV6
        help
          IPTraf-ng is a ncurses-based network monitoring utility. It gathers
          data like TCP connection packet and byte counts, interface statistics
@@ -12,7 +11,3 @@ config BR2_PACKAGE_IPTRAF_NG
          https://fedorahosted.org/iptraf-ng/
 
          IPTraf-ng is a fork of original IPTraf v3.0.0 (http://iptraf.seul.org).
-
-comment "iptraf-ng needs a toolchain w/ IPv6"
-       depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6

diff --git a/package/iputils/Config.in b/package/iputils/Config.in
index fdddb52d244489f7244fb67c8453f970097f0439..53246395730c0a317dbbde50971eefec91d42404 100644 (file)
--- a/package/iputils/Config.in
+++ b/package/iputils/Config.in
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_IPUTILS
        bool "iputils"
-       select BR2_PACKAGE_OPENSSL if BR2_INET_IPV6
+       select BR2_PACKAGE_OPENSSL
        depends on BR2_USE_MMU # fork()
        help
          This package is set of small useful utilities for Linux networking.

diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
index 735ed65e7cce951378f29c84f1bbcec55fd16452..332e20f15c354c582ae09511fe57a30f83744f44 100644 (file)
--- a/package/iputils/iputils.mk
+++ b/package/iputils/iputils.mk
@@ -10,6 +10,7 @@ IPUTILS_SOURCE = iputils-$(IPUTILS_VERSION).tar.bz2
 IPUTILS_LICENSE = GPLv2+ BSD-3c
 # Only includes a license file for BSD
 IPUTILS_LICENSE_FILES = ninfod/COPYING
+IPUTILS_DEPENDENCIES = openssl
 
 # Build after busybox so target ends up with this package's full
 # versions of the applications instead of busybox applets.
@@ -20,20 +21,8 @@ endif
 # Disabling CAP_SETPCAP (file capabilities)
 IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_CAP=no USE_SYSFS=no\
        CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \
-       arping clockdiff ping rarpd rdisc tftpd tracepath
-
-ifeq ($(BR2_INET_IPV6),y)
-# To support md5 for ping6
-IPUTILS_DEPENDENCIES += openssl
-
-IPUTILS_MAKE_OPTS += ping6 tracepath6 traceroute6
-
-define IPUTILS_IPV6_INSTALL_TARGET_CMDS
-       $(INSTALL) -D -m 755 $(@D)/ping6       $(TARGET_DIR)/bin/ping6
-       $(INSTALL) -D -m 755 $(@D)/tracepath6  $(TARGET_DIR)/bin/tracepath6
-       $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6
-endef
-endif
+       arping clockdiff ping rarpd rdisc tftpd tracepath \
+       ping6 tracepath6 traceroute6
 
 define IPUTILS_BUILD_CMDS
        $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS)
@@ -47,7 +36,9 @@ define IPUTILS_INSTALL_TARGET_CMDS
        $(INSTALL) -D -m 755 $(@D)/rdisc       $(TARGET_DIR)/sbin/rdisc
        $(INSTALL) -D -m 755 $(@D)/tftpd       $(TARGET_DIR)/usr/sbin/in.tftpd
        $(INSTALL) -D -m 755 $(@D)/tracepath   $(TARGET_DIR)/bin/tracepath
-       $(IPUTILS_IPV6_INSTALL_TARGET_CMDS)
+       $(INSTALL) -D -m 755 $(@D)/ping6       $(TARGET_DIR)/bin/ping6
+       $(INSTALL) -D -m 755 $(@D)/tracepath6  $(TARGET_DIR)/bin/tracepath6
+       $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6
 endef
 
 $(eval $(generic-package))

diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
index 375bded62470da0de9db502eb0c86bcf8471fb99..3b5ff3e58c6ccd8d5e787078c9e40b82646b23b4 100644 (file)
--- a/package/jamvm/Config.in
+++ b/package/jamvm/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_JAMVM
        bool "jamvm"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
                || BR2_mips || BR2_mipsel || BR2_powerpc
@@ -12,8 +11,7 @@ config BR2_PACKAGE_JAMVM
 
          http://jamvm.sf.net
 
-comment "jamvm needs a toolchain w/ IPv6, threads"
+comment "jamvm needs a toolchain w/ threads"
        depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \
                || BR2_mips || BR2_mipsel || BR2_powerpc
-       depends on !BR2_INET_IPV6
        depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/kodi/Config.in b/package/kodi/Config.in
index 91c1ccefb2134b040af7cc089c735b683bc93a61..254a1df0cdb3730bbbad2116d97cf6aae61f416d 100644 (file)
--- a/package/kodi/Config.in
+++ b/package/kodi/Config.in
@@ -2,9 +2,9 @@ config BR2_PACKAGE_KODI_ARCH_SUPPORTS
        bool
        default y if BR2_arm || BR2_i386 || BR2_x86_64
 
-comment "kodi needs a toolchain w/ C++, IPv6, threads, wchar"
+comment "kodi needs a toolchain w/ C++, threads, wchar"
        depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS
-       depends on !BR2_INET_IPV6 || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
        depends on BR2_USE_MMU
 
 config BR2_PACKAGE_KODI_EGL_GLES
@@ -91,7 +91,6 @@ menuconfig BR2_PACKAGE_KODI
        select BR2_PACKAGE_YAJL
        select BR2_PACKAGE_ZLIB
        select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
-       depends on BR2_INET_IPV6
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL

diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk
index 7082e8945d7f7cd681509c54fc836a1f470215d0..9b63e12874cd3371fbfcc72053a744136e002144 100644 (file)
--- a/package/libiio/libiio.mk
+++ b/package/libiio/libiio.mk
@@ -10,7 +10,7 @@ LIBIIO_INSTALL_STAGING = YES
 LIBIIO_LICENSE = LGPLv2.1+
 LIBIIO_LICENSE_FILES = COPYING
 
-LIBIIO_CONF_OPTS = -DENABLE_IPV6=$(if $(BR2_INET_IPV6),ON,OFF) \
+LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \
        -DWITH_LOCAL_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_LOCAL_BACKEND),ON,OFF) \
        -DWITH_TESTS=$(if $(BR2_PACKAGE_LIBIIO_TESTS),ON,OFF)
 

diff --git a/package/libndp/Config.in b/package/libndp/Config.in
index bb9093bd95eec27ce6aabe44feade7d4d92a3cad..6639bb5e06744667b63143dd4ad336583980ead1 100644 (file)
--- a/package/libndp/Config.in
+++ b/package/libndp/Config.in
@@ -1,12 +1,8 @@
 config BR2_PACKAGE_LIBNDP
        bool "libndp"
-       depends on BR2_INET_IPV6
        help
          This package contains a library which provides a wrapper
          for IPv6 Neighbor Discovery Protocol. It also provides a tool
          named ndptool for sending and receiving NDP messages.
 
          https://github.com/jpirko/libndp
-
-comment "libndp needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6

diff --git a/package/libnetfilter_queue/Config.in b/package/libnetfilter_queue/Config.in
index 767f44a0fc65e408dc539127ab6d9f4c79b44077..e93e8ea374edc4541aaeeac676ba7e4e197b485d 100644 (file)
--- a/package/libnetfilter_queue/Config.in
+++ b/package/libnetfilter_queue/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBNETFILTER_QUEUE
        bool "libnetfilter_queue"
-       depends on BR2_INET_IPV6
        select BR2_PACKAGE_LIBNFNETLINK
        select BR2_PACKAGE_LIBMNL
        help
@@ -9,6 +8,3 @@ config BR2_PACKAGE_LIBNETFILTER_QUEUE
          connection tracking timeout infrastructure.
 
          http://www.netfilter.org/projects/libnetfilter_queue/
-
-comment "libnetfilter_queue needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6

diff --git a/package/libnftnl/Config.in b/package/libnftnl/Config.in
index 0d3db5be25e6672f70df34bfc1d87599c1c426be..dcbfde060af5f0674a904b153b283b37d6421a19 100644 (file)
--- a/package/libnftnl/Config.in
+++ b/package/libnftnl/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBNFTNL
        bool "libnftnl"
-       depends on BR2_INET_IPV6
        # bad headers, no sa_family_t in linux/socket.h
        depends on !(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 || BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009)
        select BR2_PACKAGE_LIBMNL
@@ -32,6 +31,3 @@ comment "libnftnl XML parsing support needs a toolchain w/ threads"
        depends on !BR2_TOOLCHAIN_HAS_THREADS
 
 endif
-
-comment "libnftnl needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6

diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
index 91a740a369c9d113479ae1762a8e080a6f9fbdca..752af8798f7b220497bccb7e54057c600cec3bab 100644 (file)
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -20,7 +20,6 @@ LIBNSPR_CONF_ENV = \
 # NSPR mixes up --build and --host
 LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME)
 LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit
-LIBNSPR_CONF_OPTS += --$(if $(BR2_INET_IPV6),en,dis)able-ipv6
 
 ifeq ($(BR2_STATIC_LIBS),y)
 LIBNSPR_MAKE_OPTS = SHARED_LIBRARY=

diff --git a/package/liboping/Config.in b/package/liboping/Config.in
index 65e7c8856b54dc115631c7967aa109f50325d16c..1d2de31874064da13505112911e3d394b98abe15 100644 (file)
--- a/package/liboping/Config.in
+++ b/package/liboping/Config.in
@@ -1,11 +1,7 @@
 config BR2_PACKAGE_LIBOPING
        bool "liboping"
-       depends on BR2_INET_IPV6
        help
          liboping is a C library to generate ICMP echo requests,
          better known as "ping packets".
 
          http://noping.cc/
-
-comment "liboping needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6

diff --git a/package/libshairplay/Config.in b/package/libshairplay/Config.in
index 0895cd25132c9f55e9965ffd3427971121e4a410..1cfbdfe488790b08386e0dd5d0f0171c8af02970 100644 (file)
--- a/package/libshairplay/Config.in
+++ b/package/libshairplay/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBSHAIRPLAY
        bool "libshairplay"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # avahi
        depends on !BR2_STATIC_LIBS # avahi
@@ -13,6 +12,6 @@ config BR2_PACKAGE_LIBSHAIRPLAY
 
          https://github.com/juhovh/shairplay
 
-comment "libshairplay needs a toolchain w/ IPv6, threads, dynamic library"
+comment "libshairplay needs a toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk
index 70f107410334375f70ef9da187c49b21b8283e2c..8cbd0cb6e361b05fb9bb1bd7a46fb9526b56def9 100644 (file)
--- a/package/libsoup/libsoup.mk
+++ b/package/libsoup/libsoup.mk
@@ -11,15 +11,8 @@ LIBSOUP_SITE = http://ftp.gnome.org/pub/gnome/sources/libsoup/$(LIBSOUP_VERSION_
 LIBSOUP_LICENSE = LGPLv2+
 LIBSOUP_LICENSE_FILES = COPYING
 LIBSOUP_INSTALL_STAGING = YES
-
 LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY)
-
-ifneq ($(BR2_INET_IPV6),y)
-LIBSOUP_CONF_ENV += soup_cv_ipv6=no
-endif
-
 LIBSOUP_CONF_OPTS = --disable-glibtest
-
 LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \
        libglib2 libxml2 sqlite host-intltool
 

diff --git a/package/libuv/Config.in b/package/libuv/Config.in
index f6d7e5f1efd7a72d168c9e7885c57c4ac4624997..66cd3f2a0374b3bf9f3efc2164f543e97c9e87d7 100644 (file)
--- a/package/libuv/Config.in
+++ b/package/libuv/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_LIBUV
        bool "libuv"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
        help
@@ -9,6 +8,6 @@ config BR2_PACKAGE_LIBUV
 
          https://github.com/libuv/libuv
 
-comment "libuv needs a toolchain w/ IPv6, threads"
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+comment "libuv needs a toolchain w/ threads"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU

diff --git a/package/libvncserver/libvncserver.mk b/package/libvncserver/libvncserver.mk
index 87bcf457200c7dcc83d57f07bbff4d99077294b2..92cb1e1aa60a0ce0e5733283917ebef11e588352 100644 (file)
--- a/package/libvncserver/libvncserver.mk
+++ b/package/libvncserver/libvncserver.mk
@@ -28,10 +28,6 @@ ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
 LIBVNCSERVER_CONF_OPTS += --without-pthread
 endif
 
-ifneq ($(BR2_INET_IPV6),y)
-LIBVNCSERVER_CONF_OPTS += --without-ipv6
-endif
-
 # openssl supports needs NPTL thread support
 ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),yy)
 LIBVNCSERVER_DEPENDENCIES += openssl

diff --git a/package/libwebsockets/libwebsockets.mk b/package/libwebsockets/libwebsockets.mk
index da1a87247aabf0084f48445ab7add59f7ec881d2..9e62f1c9d143ef5a1f17d56ac23a6cae3fa334e1 100644 (file)
--- a/package/libwebsockets/libwebsockets.mk
+++ b/package/libwebsockets/libwebsockets.mk
@@ -11,14 +11,7 @@ LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions
 LIBWEBSOCKETS_LICENSE_FILES = LICENSE
 LIBWEBSOCKETS_DEPENDENCIES = zlib
 LIBWEBSOCKETS_INSTALL_STAGING = YES
-
-LIBWEBSOCKETS_CONF_OPTS += -DWITHOUT_TESTAPPS=ON
-
-ifeq ($(BR2_INET_IPV6),y)
-LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=ON
-else
-LIBWEBSOCKETS_CONF_OPTS += -DLWS_IPV6=OFF
-endif
+LIBWEBSOCKETS_CONF_OPTS = -DWITHOUT_TESTAPPS=ON -DLWS_IPV6=ON
 
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl

diff --git a/package/linphone/Config.in b/package/linphone/Config.in
index 72eca7dce56cfa09596f0b5a300ab923f6dcdbf8..6d6ffaecf85d053ff5b515bfb26bac24b6cae190 100644 (file)
--- a/package/linphone/Config.in
+++ b/package/linphone/Config.in
@@ -7,7 +7,6 @@ config BR2_PACKAGE_LINPHONE
        depends on BR2_INSTALL_LIBSTDCPP # mediastreamer
        depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
        depends on BR2_USE_MMU # libeXosip2
-       depends on BR2_INET_IPV6 # mediastreamer
        help
          Linphone is an internet phone or Voice Over IP phone (VoIP).
 
@@ -26,7 +25,6 @@ config BR2_PACKAGE_LINPHONE
 
          http://www.linphone.org/
 
-comment "linphone needs a toolchain w/ threads, C++, IPv6"
+comment "linphone needs a toolchain w/ threads, C++"
        depends on BR2_USE_MMU
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-               !BR2_INET_IPV6
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk
index 5d1f5649fdcd57f6e23ff15d99fd1a2e91142dcc..19b303b8e29df5d31289edcb809b38642883b9af 100644 (file)
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@@ -16,11 +16,6 @@ LSOF_LICENSE_FILES = dialects/linux/dproto.h
 # Make certain full-blown lsof gets built after the busybox version (1.20+)
 LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox)
 
-BR2_LSOF_CFLAGS =
-ifeq ($(BR2_INET_IPV6),)
-BR2_LSOF_CFLAGS += -UHASIPv6
-endif
-
 ifeq ($(BR2_USE_WCHAR),)
 define LSOF_CONFIGURE_WCHAR_FIXUPS
        $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \
@@ -44,7 +39,7 @@ endef
 
 define LSOF_CONFIGURE_CMDS
        (cd $(@D) ; \
-               echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" \
+               echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" \
                LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 \
                LINUX_CLIB=-DGLIBCV=2 ./Configure linux)
        $(LSOF_CONFIGURE_WCHAR_FIXUPS)
@@ -52,7 +47,7 @@ define LSOF_CONFIGURE_CMDS
 endef
 
 define LSOF_BUILD_CMDS
-       $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS) $(BR2_LSOF_CFLAGS)" -C $(@D)
+       $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D)
 endef
 
 define LSOF_INSTALL_TARGET_CMDS

diff --git a/package/ltp-testsuite/Config.in b/package/ltp-testsuite/Config.in
index 4929bbcc204577a9ba5c116a412352f622c3696b..52c02ce84cc479e761d1fb3cff4794a061727528 100644 (file)
--- a/package/ltp-testsuite/Config.in
+++ b/package/ltp-testsuite/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_LTP_TESTSUITE
        bool "ltp-testsuite"
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
        # does not build, cachectl.h issue
        depends on !BR2_nios2
@@ -22,8 +21,7 @@ config BR2_PACKAGE_LTP_TESTSUITE
 
          http://ltp.sourceforge.net/
 
-comment "ltp-testsuite needs a toolchain w/ IPv6, RPC, threads"
+comment "ltp-testsuite needs a toolchain w/ RPC, threads"
        depends on !BR2_nios2
        depends on BR2_USE_MMU
-       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || \
-               !BR2_TOOLCHAIN_HAS_NATIVE_RPC
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_NATIVE_RPC

diff --git a/package/lxc/Config.in b/package/lxc/Config.in
index dc287c1fc3f612203b141bca23f5f5c164862c65..10a668d446989963a24a189d53df291a87396036 100644 (file)
--- a/package/lxc/Config.in
+++ b/package/lxc/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_LXC
        bool "lxc"
        select BR2_PACKAGE_LIBCAP
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
        # the toolchain doesn't support setns syscall
@@ -15,9 +14,9 @@ config BR2_PACKAGE_LXC
 
          https://linuxcontainers.org/
 
-comment "lxc needs a toolchain w/ IPv6, threads, headers >= 3.0"
+comment "lxc needs a toolchain w/ threads, headers >= 3.0"
        depends on BR2_USE_MMU
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201305
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII201405
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS \
+       depends on !BR2_TOOLCHAIN_HAS_THREADS \
                || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0

diff --git a/package/mediastreamer/Config.in b/package/mediastreamer/Config.in
index ebcb647e7ce5dc04e60aaee4192a55b18a7cd7dd..396f7e464ccefcc51fb25ddd871644db8697f9c7 100644 (file)
--- a/package/mediastreamer/Config.in
+++ b/package/mediastreamer/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_MEDIASTREAMER
        select BR2_PACKAGE_ORTP
        depends on BR2_INSTALL_LIBSTDCPP # until fixed
        depends on BR2_TOOLCHAIN_HAS_THREADS # ortp
-       depends on BR2_INET_IPV6
        help
          Mediastreamer is a powerful and lightweighted streaming
          engine specialized for voice/video telephony applications.
@@ -14,6 +13,5 @@ config BR2_PACKAGE_MEDIASTREAMER
 
          http://www.linphone.org/eng/documentation/dev/mediastreamer2.html
 
-comment "mediastreamer needs a toolchain w/ threads, C++, IPv6"
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-               !BR2_INET_IPV6
+comment "mediastreamer needs a toolchain w/ threads, C++"
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/minidlna/Config.in b/package/minidlna/Config.in
index c78f1b68a5af34193545864ca6919e749f5088c6..0eef7512a15dac2cfac8dc79afd3dcfa4d5554d5 100644 (file)
--- a/package/minidlna/Config.in
+++ b/package/minidlna/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_MINIDLNA
        bool "minidlna"
-       depends on BR2_INET_IPV6 # ffmpeg
        depends on BR2_USE_WCHAR # flac
        depends on BR2_USE_MMU # fork
        depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -22,6 +21,6 @@ config BR2_PACKAGE_MINIDLNA
 
          http://minidlna.sourceforge.net/
 
-comment "minidlna needs a toolchain w/ IPv6, threads, wchar"
+comment "minidlna needs a toolchain w/ threads, wchar"
        depends on BR2_USE_MMU
-       depends on !(BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
+       depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)

diff --git a/package/modem-manager/Config.in b/package/modem-manager/Config.in
index 1c565ee17f48f064b5885b3d3f73b67814aa7a11..59b8d88f0b83d20f233848519f914092155b7dbc 100644 (file)
--- a/package/modem-manager/Config.in
+++ b/package/modem-manager/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_MODEM_MANAGER
        bool "modemmanager"
        depends on BR2_PACKAGE_HAS_UDEV
        select BR2_PACKAGE_DBUS
-       depends on BR2_INET_IPV6
        depends on BR2_USE_WCHAR # libglib2 and gnutls
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus
@@ -28,7 +27,7 @@ config BR2_PACKAGE_MODEM_MANAGER_LIBQMI
          This option enables support for QMI protocol
 endif
 
-comment "modemmanager needs udev /dev management and a toolchain w/ wchar, threads, IPv6"
-       depends on !BR2_INET_IPV6 || !BR2_USE_WCHAR || \
-               !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV
+comment "modemmanager needs udev /dev management and a toolchain w/ wchar, threads"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+               !BR2_PACKAGE_HAS_UDEV
        depends on BR2_USE_MMU

diff --git a/package/mongrel2/Config.in b/package/mongrel2/Config.in
index 77ca9213267be9de9dbb80e58fc4c80903f86946..1afba77151b04ef53ea25378f1fdbf3aaa88f12b 100644 (file)
--- a/package/mongrel2/Config.in
+++ b/package/mongrel2/Config.in
@@ -1,8 +1,8 @@
-comment "mongrel2 needs a toolchain w/ C++, IPv6, threads, wchar"
+comment "mongrel2 needs a toolchain w/ C++, threads, wchar"
        depends on BR2_UCLIBC_VERSION_SNAPSHOT || \
                BR2_TOOLCHAIN_USES_GLIBC || \
                BR2_arm
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 || \
+       depends on !BR2_INSTALL_LIBSTDCPP || \
                !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR
 
 config BR2_PACKAGE_MONGREL2
@@ -10,7 +10,6 @@ config BR2_PACKAGE_MONGREL2
        select BR2_PACKAGE_SQLITE
        select BR2_PACKAGE_ZEROMQ
        depends on BR2_INSTALL_LIBSTDCPP # zeromq
-       depends on BR2_INET_IPV6 # zeromq
        depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
        depends on BR2_USE_WCHAR # zeromq -> util-linux
        # {get,make,swap}context functions present in

diff --git a/package/mono/Config.in b/package/mono/Config.in
index cc015e64f78288da6e5c5ce18a31b8ca27ac0d0d..1db5df46ae459c18f8deee4693ba42daf9601bab 100644 (file)
--- a/package/mono/Config.in
+++ b/package/mono/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_MONO_ARCH_SUPPORTS
 config BR2_PACKAGE_MONO
        bool "mono"
        depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_MONO_45 if !BR2_PACKAGE_MONO_20 && !BR2_PACKAGE_MONO_40
        help
@@ -37,5 +36,5 @@ config BR2_PACKAGE_MONO_45
 
 endif
 
-comment "mono needs a toolchain w/ IPv6, threads"
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+comment "mono needs a toolchain w/ threads"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 8ed11490fefc8850d56c57c9f3c95836d8892e32..5e19297939e1d6d1eabcefd8dd36d6108de93aa3 100644 (file)
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -78,15 +78,11 @@ config BR2_PACKAGE_MPD_FAAD2
 config BR2_PACKAGE_MPD_FFMPEG
        bool "ffmpeg"
        select BR2_PACKAGE_FFMPEG
-       depends on BR2_INET_IPV6
        help
          Enable ffmpeg input support.
          Select this if you want to play back files supported by
          ffmpeg.
 
-comment "ffmpeg support needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_MPD_FLAC
        bool "flac"
        select BR2_PACKAGE_FLAC

diff --git a/package/mplayer/mplayer.mk b/package/mplayer/mplayer.mk
index 55cf4210bd8c5fbb44fce51037ee1027d34dbddc..3a61b8f4c17fb2fe2f922fee1f1efdb5c33248d4 100644 (file)
--- a/package/mplayer/mplayer.mk
+++ b/package/mplayer/mplayer.mk
@@ -264,22 +264,10 @@ define MPLAYER_CONFIGURE_CMDS
                --enable-cross-compile \
                --disable-ivtv \
                --enable-dynamic-plugins \
+               --enable-inet6 \
        )
 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)
-define MPLAYER_FIXUP_IPV6_MREQ_DETECTION
-       $(SED) 's/\(#define HAVE_STRUCT_IPV6_MREQ\) 1/\1 0/' $(@D)/config.h
-endef
-
-MPLAYER_POST_CONFIGURE_HOOKS += MPLAYER_FIXUP_IPV6_MREQ_DETECTION
-MPLAYER_CONF_OPTS += --disable-inet6
-else
-MPLAYER_CONF_OPTS += --enable-inet6
-endif
-
 define MPLAYER_BUILD_CMDS
        $(MAKE) -C $(@D)
 endef

diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index bef51787b7a12a86487d2440ec397d6dcc56a423..6653464f16cc7520ba8750af622dd13fe8c96624 100644 (file)
--- a/package/mtd/Config.in
+++ b/package/mtd/Config.in
@@ -90,12 +90,8 @@ config BR2_PACKAGE_MTD_NFTL_FORMAT
        bool "nftl_format"
 
 config BR2_PACKAGE_MTD_RECV_IMAGE
-       depends on BR2_INET_IPV6
        bool "recv_image"
 
-comment "recv_image needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_MTD_RFDDUMP
        bool "rfddump"
 

diff --git a/package/ndisc6/Config.in b/package/ndisc6/Config.in
index 0fad92a9d7ce9e25fe64e526e58bade50d13eb25..321bfbc96372bbdc411da85781e6d3ca5896e7a1 100644 (file)
--- a/package/ndisc6/Config.in
+++ b/package/ndisc6/Config.in
@@ -1,10 +1,5 @@
-comment "ndisc6 needs a toolchain w/ IPv6"
-       depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_NDISC6
        bool "ndisc6 tools"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE
        help

diff --git a/package/net-tools/net-tools.mk b/package/net-tools/net-tools.mk
index ee69648764415b91f3da991629d3265e5a28bb57..ab0dd7cb26acb4d9cf5325fe1cad0cbdae3906aa 100644 (file)
--- a/package/net-tools/net-tools.mk
+++ b/package/net-tools/net-tools.mk
@@ -28,12 +28,10 @@ define NET_TOOLS_ENABLE_I18N
 endef
 endif
 
-# Enable IPv6 when appropiate
-ifeq ($(BR2_INET_IPV6),y)
+# Enable IPv6
 define NET_TOOLS_ENABLE_IPV6
        $(SED) 's:_AFINET6 0:_AFINET6 1:' $(@D)/config.h
 endef
-endif
 
 NET_TOOLS_POST_CONFIGURE_HOOKS += NET_TOOLS_ENABLE_I18N NET_TOOLS_ENABLE_IPV6
 

diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
index f74701111361f8dec4b95020e6af5ee999e42bf9..6eff5e30163ed0a5735e8722c1a91aa01c035a55 100644 (file)
--- a/package/netsnmp/netsnmp.mk
+++ b/package/netsnmp/netsnmp.mk
@@ -17,7 +17,7 @@ NETSNMP_CONF_OPTS = \
        --enable-mini-agent \
        --without-rpm \
        --with-logfile=none \
-       --without-kmem-usage $(DISABLE_IPV6) \
+       --without-kmem-usage \
        --enable-as-needed \
        --without-perl-modules \
        --disable-embedded-perl \
@@ -81,15 +81,6 @@ else
 NETSNMP_CONF_OPTS += --disable-applications
 endif
 
-# Remove IPv6 MIBs if there's no IPv6
-ifneq ($(BR2_INET_IPV6),y)
-define NETSNMP_REMOVE_MIBS_IPV6
-       rm -f $(TARGET_DIR)/usr/share/snmp/mibs/IPV6*
-endef
-
-NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_REMOVE_MIBS_IPV6
-endif
-
 define NETSNMP_REMOVE_BLOAT_MIBS
        for mib in $(NETSNMP_BLOAT_MIBS); do \
                rm -f $(TARGET_DIR)/usr/share/snmp/mibs/$$mib-MIB.txt; \

diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in
index e68a4dd44fb096dccf86cd27de5528e3156ff719..cc8f616a7a424df98896b5b6cbafafe3f0f9498d 100644 (file)
--- a/package/network-manager/Config.in
+++ b/package/network-manager/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_NETWORK_MANAGER
        bool "networkmanager"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_WCHAR # libglib2 and gnutls
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2
        depends on BR2_USE_MMU # dbus
@@ -51,8 +50,7 @@ config BR2_PACKAGE_NETWORK_MANAGER_PPPD
          This option enables support for PPPD daemon
 endif
 
-comment "NetworkManager needs udev /dev management and a toolchain w/ IPv6, wchar, threads, headers >= 3.7"
+comment "NetworkManager needs udev /dev management and a toolchain w/ wchar, threads, headers >= 3.7"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || !BR2_USE_WCHAR || \
-               !BR2_TOOLCHAIN_HAS_THREADS || \
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
                !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7

diff --git a/package/nftables/Config.in b/package/nftables/Config.in
index 9779ae99eaebcc3c6590e7127ec216bcd5400fed..9b20b905579244e8aaa8fb4a2cbbca7c771d0165 100644 (file)
--- a/package/nftables/Config.in
+++ b/package/nftables/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_NFTABLES
        bool "nftables"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_WCHAR
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
        select BR2_PACKAGE_GMP
@@ -16,6 +15,5 @@ config BR2_PACKAGE_NFTABLES
 
          http://www.netfilter.org/projects/nftables/index.html
 
-comment "nftables needs a toolchain w/ IPv6, wchar, headers >= 3.4"
-       depends on !BR2_INET_IPV6 || \
-               !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
+comment "nftables needs a toolchain w/ wchar, headers >= 3.4"
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4

diff --git a/package/nginx/nginx.mk b/package/nginx/nginx.mk
index be9bd0a2ea911a760874e80059130d945053d546..90ebbcc9895fbf60ab2b404e2e57d655cbb28ae6 100644 (file)
--- a/package/nginx/nginx.mk
+++ b/package/nginx/nginx.mk
@@ -14,7 +14,8 @@ NGINX_CONF_OPTS = \
        --with-cc="$(TARGET_CC)" \
        --with-cpp="$(TARGET_CC)" \
        --with-cc-opt="$(TARGET_CFLAGS)" \
-       --with-ld-opt="$(TARGET_LDFLAGS)"
+       --with-ld-opt="$(TARGET_LDFLAGS)" \
+       --with-ipv6
 
 # www-data user and group are used for nginx. Because these user and group
 # are already set by buildroot, it is not necessary to redefine them.
@@ -63,8 +64,7 @@ NGINX_CONF_OPTS += \
        --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi
 
 NGINX_CONF_OPTS += \
-       $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \
-       $(if $(BR2_INET_IPV6),--with-ipv6)
+       $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio)
 
 ifeq ($(BR2_PACKAGE_PCRE),y)
 NGINX_DEPENDENCIES += pcre

diff --git a/package/nmap/Config.in b/package/nmap/Config.in
index 2364dacb5e755175db689cd1a9071652940624e1..79f587afd1078810b7f1287b76f13c870c7d288e 100644 (file)
--- a/package/nmap/Config.in
+++ b/package/nmap/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_NMAP
        bool "nmap"
-       depends on BR2_INET_IPV6
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS
@@ -12,6 +11,6 @@ config BR2_PACKAGE_NMAP
 
          http://nmap.org
 
-comment "nmap needs a toolchain w/ C++, IPv6, threads"
+comment "nmap needs a toolchain w/ C++, threads"
        depends on BR2_USE_MMU
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && BR2_TOOLCHAIN_HAS_THREADS)
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in
index 5f1346c5754d7b8ac4683024627bb6002b654efa..d044c8ea3757a4a1801ca35486f058b2482398af 100644 (file)
--- a/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_NODEJS
        bool "nodejs"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
@@ -15,12 +14,11 @@ config BR2_PACKAGE_NODEJS
 
          http://nodejs.org/
 
-comment "nodejs needs a toolchain w/ C++, IPv6, threads"
+comment "nodejs needs a toolchain w/ C++, threads"
        depends on BR2_USE_MMU
        depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel
        depends on !BR2_ARM_CPU_ARMV4
-       depends on !BR2_INSTALL_LIBSTDCPP || \
-               !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
 
 if BR2_PACKAGE_NODEJS
 

diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk
index c91cc7024c0a5a944c0045bd375328a689a189c2..554094db1b3a75a3f28f215f4e7ee976c7912446 100644 (file)
--- a/package/ntp/ntp.mk
+++ b/package/ntp/ntp.mk
@@ -18,10 +18,6 @@ NTP_CONF_OPTS = \
        --with-yielding-select=yes \
        --disable-local-libevent
 
-ifneq ($(BR2_INET_IPV6),y)
-NTP_CONF_ENV += isc_cv_have_in6addr_any=no
-endif
-
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 NTP_CONF_OPTS += --with-crypto
 NTP_DEPENDENCIES += openssl

diff --git a/package/odhcp6c/Config.in b/package/odhcp6c/Config.in
index 9e5f3ef732227f7b4956669e0239051856206dae..329b55c1c6d6127f400167b6d19c6411d0d04632 100644 (file)
--- a/package/odhcp6c/Config.in
+++ b/package/odhcp6c/Config.in
@@ -1,10 +1,5 @@
-comment "odhcp6c needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-       depends on BR2_USE_MMU
-
 config BR2_PACKAGE_ODHCP6C
        bool "odhcp6c"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_MMU # fork()
        help
          odhcp6c is a minimal DHCPv6 and RA-client for use in embedded Linux

diff --git a/package/olsr/Config.in b/package/olsr/Config.in
index 707191a947ef1891c46f1d92f3981acf0f14643c..70e5a48963311ce1d0c045673d92b55b8f115eb2 100644 (file)
--- a/package/olsr/Config.in
+++ b/package/olsr/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_OLSR
        bool "olsrd"
        depends on BR2_USE_MMU # fork()
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        help
          The Optimized Link State Routing protocol (OLSR) is a
@@ -13,6 +12,6 @@ config BR2_PACKAGE_OLSR
 
          http://www.olsr.org/
 
-comment "olsr needs a toolchain w/ IPv6, threads"
+comment "olsr needs a toolchain w/ threads"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/opencv/Config.in b/package/opencv/Config.in
index b1cab9cef7f5ad4f10fbf82393269137d00e36f9..e40437f68137c9f0237ea400f5dba409de605026 100644 (file)
--- a/package/opencv/Config.in
+++ b/package/opencv/Config.in
@@ -129,16 +129,12 @@ comment "3rd party support"
 
 config BR2_PACKAGE_OPENCV_WITH_FFMPEG
        bool "ffmpeg support"
-       depends on BR2_INET_IPV6
        select BR2_PACKAGE_BZIP2
        select BR2_PACKAGE_FFMPEG
        select BR2_PACKAGE_FFMPEG_SWSCALE
        help
          Use ffmpeg from the target system.
 
-comment "ffmpeg support needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_OPENCV_WITH_GSTREAMER
        bool "gstreamer support"
        depends on BR2_USE_MMU # gstreamer -> libglib2

diff --git a/package/openntpd/Config.in b/package/openntpd/Config.in
index 192576f73187657d6321a614556efacd1544cb76..1433b0979a6347be25765672908af0935be15f96 100644 (file)
--- a/package/openntpd/Config.in
+++ b/package/openntpd/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_OPENNTPD
        bool "openntpd"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
        depends on BR2_USE_MMU # fork ()
        depends on !BR2_PACKAGE_NTP # conflicting binaries
@@ -12,6 +11,6 @@ config BR2_PACKAGE_OPENNTPD
 
          http://www.openntpd.org/
 
-comment "openntpd needs a toolchain w/ NPTL, IPv6"
+comment "openntpd needs a toolchain w/ NPTL"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
+       depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL

diff --git a/package/openobex/Config.in b/package/openobex/Config.in
index c56692d2bd03b99d4de3e6f08f2d85ff351c00f9..5f606fee9ae0ea97079e9bcd5c64fc35e06be03e 100644 (file)
--- a/package/openobex/Config.in
+++ b/package/openobex/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_OPENOBEX
        bool "openobex"
-       depends on BR2_INET_IPV6
        help
          Free open source implementation of the Object Exchange (OBEX)
          protocol.
@@ -41,6 +40,3 @@ config BR2_PACKAGE_OPENOBEX_DUMP
        bool "enable protocol dumping for debugging"
 
 endif
-
-comment "openobex needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6

diff --git a/package/openpgm/Config.in b/package/openpgm/Config.in
index 8d03c848bb5de5d6f99df3a435fe68a1ab6e99b9..cef5ed43774a21186fe8d737291d1492b018c3d6 100644 (file)
--- a/package/openpgm/Config.in
+++ b/package/openpgm/Config.in
@@ -5,7 +5,6 @@ config BR2_PACKAGE_OPENPGM
        depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1
        depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on BR2_INET_IPV6
        depends on BR2_USE_WCHAR
        help
          OpenPGM is an open source implementation of the Pragmatic General
@@ -16,5 +15,5 @@ config BR2_PACKAGE_OPENPGM
 
          http://code.google.com/p/openpgm/
 
-comment "openpgm needs a toolchain w/ wchar, threads, IPv6"
-       depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6 && BR2_USE_WCHAR)
+comment "openpgm needs a toolchain w/ wchar, threads"
+       depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)

diff --git a/package/openvmtools/Config.in b/package/openvmtools/Config.in
index bcc9ad06bb624e223e47185a0f731f57dc742eab..ebad87659d749527ad4e1632af912377dbe4ae82 100644 (file)
--- a/package/openvmtools/Config.in
+++ b/package/openvmtools/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_OPENVMTOOLS
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_USE_MMU # libglib2
        depends on BR2_USE_WCHAR # libglib2
-       depends on BR2_INET_IPV6 # libdnet
        depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
        depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
        depends on BR2_ENABLE_LOCALE
@@ -45,8 +44,8 @@ comment "PAM support needs a toolchain w/ dynamic library"
 
 endif
 
-comment "openvmtools needs a toolchain w/ wchar, IPv6, threads, RPC, locale"
+comment "openvmtools needs a toolchain w/ wchar, threads, RPC, locale"
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || \
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
                   !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE

diff --git a/package/openvpn/Config.in b/package/openvpn/Config.in
index 26b6b98353df5ce941dc5801ac261e5b18a5db6b..5edb479d9f7da62ce099e751e3d070440e048f61 100644 (file)
--- a/package/openvpn/Config.in
+++ b/package/openvpn/Config.in
@@ -1,10 +1,5 @@
-comment "openvpn needs a toolchain w/ IPv6"
-       depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_OPENVPN
        bool "openvpn"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_MMU # fork()
        help
          OpenVPN is a full-featured SSL VPN solution which can

diff --git a/package/php-zmq/Config.in b/package/php-zmq/Config.in
index 37322a2616897eb6269087434cef870a4fe7045d..c258272560b0c94576c1d2935179c540dd20221c 100644 (file)
--- a/package/php-zmq/Config.in
+++ b/package/php-zmq/Config.in
@@ -1,12 +1,11 @@
-comment "php-zmq needs a toolchain w/ C++, IPv6, wchar, threads"
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 \
-               && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "php-zmq needs a toolchain w/ C++, wchar, threads"
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR \
+               && BR2_TOOLCHAIN_HAS_THREADS)
 
 config BR2_PACKAGE_PHP_ZMQ
        bool "php-zmq"
        depends on BR2_PACKAGE_PHP
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_INET_IPV6
        depends on BR2_USE_WCHAR # util-linux
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_ZEROMQ

diff --git a/package/php/Config.ext b/package/php/Config.ext
index a0898b926f3c1bb888523112b02abb4605de67d7..e529409a05135ac8dc716e9160743f5f8852bb74 100644 (file)
--- a/package/php/Config.ext
+++ b/package/php/Config.ext
@@ -274,13 +274,9 @@ config BR2_PACKAGE_PHP_EXT_SNMP
 
 config BR2_PACKAGE_PHP_EXT_SOCKETS
        bool "sockets"
-       depends on BR2_INET_IPV6
        help
          Sockets support
 
-comment "sockets support needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-
 comment "Process Control"
 
 config BR2_PACKAGE_PHP_EXT_PCNTL

diff --git a/package/php/php.mk b/package/php/php.mk
index f305afa700b6c77420a4e23b431112f337a8206e..e4331f2c16e6a959bbc2636c0acdf64e5b906c77 100644 (file)
--- a/package/php/php.mk
+++ b/package/php/php.mk
@@ -61,13 +61,6 @@ else
 PHP_CONF_ENV += ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no
 endif
 
-# Workaround for non-IPv6 uClibc toolchain
-ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
-ifneq ($(BR2_INET_IPV6),y)
-PHP_CFLAGS += -DHAVE_DEPRECATED_DNS_FUNCS
-endif
-endif
-
 PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CLI),,--disable-cli)
 PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_CGI),,--disable-cgi)
 PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_FPM),--enable-fpm,--disable-fpm)

diff --git a/package/postgresql/postgresql.mk b/package/postgresql/postgresql.mk
index 006e79b83c977e0b0f71f451c492ad89c5873f19..85ac0e6da9f748f368326284305f1f9e4274e4c3 100644 (file)
--- a/package/postgresql/postgresql.mk
+++ b/package/postgresql/postgresql.mk
@@ -9,17 +9,11 @@ POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
 POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
 POSTGRESQL_LICENSE = PostgreSQL
 POSTGRESQL_LICENSE_FILES = COPYRIGHT
-
 POSTGRESQL_INSTALL_STAGING = YES
 POSTGRESQL_CONFIG_SCRIPTS = pg_config
+POSTGRESQL_CONF_ENV = ac_cv_type_struct_sockaddr_in6=yes
 
 ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
-# overwrite IPV6 detection
-ifeq ($(BR2_INET_IPV6),y)
-POSTGRESQL_CONF_ENV += ac_cv_type_struct_sockaddr_in6=yes
-else
-POSTGRESQL_CONF_ENV += ac_cv_type_struct_sockaddr_in6=no
-endif
 # PostgreSQL does not build against uClibc with locales
 # enabled, due to an uClibc bug, see
 # http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html

diff --git a/package/pppd/pppd.mk b/package/pppd/pppd.mk
index b268fbe9cad34eed3f26874d03b3024f61629ee6..0f9945fcda20090e49b6949220bf5b9b975b50bd 100644 (file)
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -12,6 +12,7 @@ PPPD_LICENSE_FILES = \
        pppd/tdb.c pppd/plugins/pppoatm/COPYING \
        pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c
 
+PPPD_MAKE_OPTS = HAVE_INET6=y
 PPPD_INSTALL_STAGING = YES
 PPPD_TARGET_BINS = chat pppd pppdump pppstats
 PPPD_RADIUS_CONF = \
@@ -24,10 +25,6 @@ PPPD_DEPENDENCIES += libpcap
 PPPD_MAKE_OPTS += FILTER=y
 endif
 
-ifeq ($(BR2_INET_IPV6),y)
-PPPD_MAKE_OPTS += HAVE_INET6=y
-endif
-
 # pppd bundles some but not all of the needed kernel headers. The embedded
 # if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34,
 # and has been part of the kernel headers since 2.6.23, so drop it

diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 575c3815590f88b3f9b75c550fdb6389ce25e5a2..023b4ddc9fcab7b5d1907e2977a92f4bb4b7047f 100644 (file)
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -48,8 +48,7 @@ PROFTPD_MAKE = $(MAKE1)
 
 define PROFTPD_INSTALL_TARGET_CMDS
        $(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
-       $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
-       $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;)
+       $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf
 endef
 
 define PROFTPD_INSTALL_INIT_SYSV

diff --git a/package/python-pyzmq/Config.in b/package/python-pyzmq/Config.in
index c52170649799a2b861d12c81f2f213bc72a87bed..af4467fa7c138c1d070a0cbd98a743c93b7e1604 100644 (file)
--- a/package/python-pyzmq/Config.in
+++ b/package/python-pyzmq/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_PYZMQ
        bool "python-pyzmq"
-       depends on BR2_INET_IPV6 # zeromq
        depends on BR2_USE_WCHAR # zeromq
        depends on BR2_INSTALL_LIBSTDCPP # zeromq
        depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
@@ -10,7 +9,7 @@ config BR2_PACKAGE_PYTHON_PYZMQ
 
          http://zeromq.org/bindings:python
 
-comment "python-pyzmq needs a toolchain w/ C++, IPv6, wchar, threads"
+comment "python-pyzmq needs a toolchain w/ C++, wchar, threads"
        depends on BR2_PACKAGE_PYTHON
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \
-               BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+               BR2_TOOLCHAIN_HAS_THREADS)

diff --git a/package/qemu/Config.in b/package/qemu/Config.in
index 65421c0b9fd827717d9defe2d710b6cc4e03fefe..fff786d3f11f930a7fd53bd47b852ef8ccebd72e 100644 (file)
--- a/package/qemu/Config.in
+++ b/package/qemu/Config.in
@@ -1,7 +1,7 @@
-comment "QEMU requires a toolchain with IPv6, wchar, threads"
+comment "QEMU requires a toolchain with wchar, threads"
        depends on BR2_i386 || BR2_x86_64
        depends on BR2_USE_MMU
-       depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR && BR2_INET_IPV6)
+       depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR)
 
 config BR2_PACKAGE_QEMU
        bool "QEMU"
@@ -9,7 +9,6 @@ config BR2_PACKAGE_QEMU
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_WCHAR # gettext
        depends on BR2_USE_MMU # fork()
-       depends on BR2_INET_IPV6 # for linux-user
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_PIXMAN
        select BR2_PACKAGE_ZLIB

diff --git a/package/qt/qt.mk b/package/qt/qt.mk
index 76acbfcea476c119d5cb34ed1cb9defdfc988a96..d1615ae0bfebb8f9b3bd5c3dacfe11caa5e3b112 100644 (file)
--- a/package/qt/qt.mk
+++ b/package/qt/qt.mk
@@ -474,13 +474,6 @@ define QT_QMAKE_SET
        $(SED) '/include.*qws.conf/a$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
 endef
 
-ifneq ($(BR2_INET_IPV6),y)
-define QT_CONFIGURE_IPV6
-       $(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(@D)/configure
-       $(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(@D)/configure
-endef
-endif
-
 ifneq ($(QT_CONFIG_FILE),)
 define QT_CONFIGURE_CONFIG_FILE
        cp $(QT_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index 9d316b1e799e13f17f4232a43af5897569e91e1d..e8ec7d90f3fc72a1566019fa9f457176cfa31ba9 100644 (file)
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -11,15 +11,14 @@ config BR2_PACKAGE_QT5_JSCORE_AVAILABLE
        depends on !BR2_ARM_CPU_ARMV4
        default y
 
-comment "Qt5 needs a toolchain w/ wchar, IPv6, NPTL, C++"
+comment "Qt5 needs a toolchain w/ wchar, NPTL, C++"
        depends on !BR2_PACKAGE_QT
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL
 
 menuconfig BR2_PACKAGE_QT5
        bool "Qt5"
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
        depends on !BR2_PACKAGE_QT
        select BR2_PACKAGE_QT5BASE

diff --git a/package/quagga/Config.in b/package/quagga/Config.in
index 4a9f8bb0d8d35c4aedef3f2d0c5254c6526343d6..89ff6f25df16dbbfc23ca13e9a508dcb044fae06 100644 (file)
--- a/package/quagga/Config.in
+++ b/package/quagga/Config.in
@@ -1,11 +1,6 @@
-comment "quagga needs a toolchain w/ IPv6"
-       depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6
-
 config BR2_PACKAGE_QUAGGA
        bool "quagga"
        depends on BR2_USE_MMU # fork()
-       depends on BR2_INET_IPV6
        help
          Routing software suite, providing implementations of
          OSPFv2, OSPFv3 (IPv6), RIP v1 and v2, RIPng (IPv6) and BGPv4+.

diff --git a/package/radvd/Config.in b/package/radvd/Config.in
index c04a8e5a327ac04548970d5e92e72bad4db60071..48aeedc08f195ce96aba5a2b40f36067f551ff5d 100644 (file)
--- a/package/radvd/Config.in
+++ b/package/radvd/Config.in
@@ -1,13 +1,8 @@
 config BR2_PACKAGE_RADVD
        bool "radvd"
        depends on BR2_USE_MMU # fork()
-       depends on BR2_INET_IPV6
        select BR2_PACKAGE_FLEX
        help
          IPv6 Router Advertisement Daemon.
 
          http://www.litech.org/radvd/
-
-comment "radvd needs a toolchain w/ IPv6"
-       depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6

diff --git a/package/redis/Config.in b/package/redis/Config.in
index 695bd91778f3c9081bf16e8a72668f0ae883a0a0..3b7b7436ccd58f4abf0c6ab1947c31d98c478c17 100644 (file)
--- a/package/redis/Config.in
+++ b/package/redis/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_REDIS
        bool "redis"
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on BR2_INET_IPV6
        help
          Redis is an open source, advanced key-value store. It is
          often referred to as a data structure server since keys can
@@ -10,6 +9,6 @@ config BR2_PACKAGE_REDIS
 
          http://www.redis.io
 
-comment "redis needs a toolchain w/ IPv6, threads"
+comment "redis needs a toolchain w/ threads"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/samba/samba.mk b/package/samba/samba.mk
index f4f07acb6bc9b20ea0170caf495e230ef1b3d72d..68da9d95fc43f0163fa8cf85905d863c06648390 100644 (file)
--- a/package/samba/samba.mk
+++ b/package/samba/samba.mk
@@ -29,7 +29,7 @@ SAMBA_CONF_ENV = \
        libreplace_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=yes \
        $(if $(BR2_PACKAGE_SAMBA_AVAHI),AVAHI_LIBS=-pthread)
 
 SAMBA_CONF_OPTS = \

diff --git a/package/sconeserver/sconeserver.mk b/package/sconeserver/sconeserver.mk
index d619ad19dd04c0f642db669a7935e013ac9b1e4d..3ff891bcc46ad93fcc04ce68e31c4b5f84fb8411 100644 (file)
--- a/package/sconeserver/sconeserver.mk
+++ b/package/sconeserver/sconeserver.mk
@@ -13,7 +13,7 @@ SCONESERVER_LICENSE_FILES = COPYING
 
 SCONESERVER_AUTORECONF = YES
 SCONESERVER_DEPENDENCIES += pcre
-SCONESERVER_CONF_OPTS += --with-ip --with-local
+SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6
 
 # Sconeserver configure script fails to find the libxml2 headers.
 ifeq ($(BR2_PACKAGE_LIBXML2),y)
@@ -21,12 +21,6 @@ SCONESERVER_CONF_OPTS += \
        --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config"
 endif
 
-ifeq ($(BR2_INET_IPV6),y)
-SCONESERVER_CONF_OPTS += --with-ip6
-else
-SCONESERVER_CONF_OPTS += --without-ip6
-endif
-
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SCONESERVER_DEPENDENCIES += openssl
 SCONESERVER_CONF_OPTS += --with-ssl

diff --git a/package/ser2net/Config.in b/package/ser2net/Config.in
index 552ab0f0941e01d8edd48233cddad46d3fa255d3..3f0d15b30d6b02f7d3e6b1ce35dff2ce98fa6459 100644 (file)
--- a/package/ser2net/Config.in
+++ b/package/ser2net/Config.in
@@ -1,13 +1,8 @@
 config BR2_PACKAGE_SER2NET
        bool "ser2net"
        depends on BR2_USE_MMU # fork()
-       depends on BR2_INET_IPV6
        help
          Ser2net provides a way for a user to connect from a network
          connection to a serial port..
 
          http://ser2net.sourceforge.net
-
-comment "ser2net needs a toolchain w/ IPv6"
-       depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6

diff --git a/package/smcroute/Config.in b/package/smcroute/Config.in
index c244cb934585784b72183827e7758786d04f4358..f9a81f6f2b323a8d46bdcba6e4a3f6c2bb8d3fad 100755 (executable)
--- a/package/smcroute/Config.in
+++ b/package/smcroute/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_SMCROUTE
        bool "smcroute"
-       depends on BR2_INET_IPV6
        depends on BR2_USE_MMU # fork()
        help
          SMCRoute is a command line tool to manipulate the multicast
@@ -11,7 +10,3 @@ config BR2_PACKAGE_SMCROUTE
          MLD signaling exists.
 
          https://github.com/troglobit/smcroute
-
-comment "smcroute needs a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-       depends on BR2_USE_MMU

diff --git a/package/sofia-sip/sofia-sip.mk b/package/sofia-sip/sofia-sip.mk
index 8bb40f1b16b89baf81e280297b047e3c8b53461a..5ece44839fa0cb99cf9db560817620b45be55782 100644 (file)
--- a/package/sofia-sip/sofia-sip.mk
+++ b/package/sofia-sip/sofia-sip.mk
@@ -10,13 +10,8 @@ SOFIA_SIP_INSTALL_STAGING = YES
 SOFIA_SIP_DEPENDENCIES = host-pkgconf
 SOFIA_SIP_LICENSE = LGPLv2.1+
 SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS
-
 SOFIA_SIP_CONF_OPTS = --with-doxygen=no
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),)
-SOFIA_SIP_CONF_OPTS = --disable-ip6
-endif
-
 ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
 SOFIA_SIP_CONF_OPTS += --with-glib
 SOFIA_SIP_DEPENDENCIES += libglib2

diff --git a/package/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
index aac2f9ed9d8230b2bdefe1ea1fc04ba9579a8f18..13357bba3b84b39565db49b3728df86de4e0747b 100644 (file)
--- a/package/spawn-fcgi/spawn-fcgi.mk
+++ b/package/spawn-fcgi/spawn-fcgi.mk
@@ -10,8 +10,4 @@ SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2
 SPAWN_FCGI_LICENSE = BSD-3c
 SPAWN_FCGI_LICENSE_FILES = COPYING
 
-ifneq ($(BR2_INET_IPV6),y)
-SPAWN_FCGI_CONF_OPTS = --disable-ipv6
-endif
-
 $(eval $(autotools-package))

diff --git a/package/squid/Config.in b/package/squid/Config.in
index a9300d8e348e8cc82831195a7754a213c86428fb..0ab6b373a4937d575d55579d7043ddc340baab59 100644 (file)
--- a/package/squid/Config.in
+++ b/package/squid/Config.in
@@ -1,12 +1,10 @@
-comment "squid needs a toolchain w/ C++, IPv6, headers >= 3.0"
+comment "squid needs a toolchain w/ C++, headers >= 3.0"
        depends on BR2_USE_MMU
-       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_INET_IPV6 \
-               || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
+       depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0
 
 config BR2_PACKAGE_SQUID
        bool "squid"
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_INET_IPV6
        # needs fork()
        depends on BR2_USE_MMU
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libcap

diff --git a/package/strongswan/Config.in b/package/strongswan/Config.in
index 23131dc1b27e270e245ef5842081e52cb21cdd2e..b26f1c728b72e4c608c74678997dd99b91909455 100644 (file)
--- a/package/strongswan/Config.in
+++ b/package/strongswan/Config.in
@@ -22,9 +22,6 @@ menuconfig BR2_PACKAGE_STRONGSWAN
 
 if BR2_PACKAGE_STRONGSWAN
 
-comment "kernel-netlink and socket-default options need a toolchain w/ IPv6"
-       depends on !BR2_INET_IPV6
-
 choice
        prompt "Cryptographic backend"
        default BR2_PACKAGE_STRONGSWAN_GMP

diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk
index 057870fa80e6245597e1bd00cc1b069bfd27d33b..af21ddaee2499d70b04803c00f21800d114881c2 100644 (file)
--- a/package/strongswan/strongswan.mk
+++ b/package/strongswan/strongswan.mk
@@ -14,8 +14,8 @@ STRONGSWAN_CONF_OPTS += \
        --without-lib-prefix \
        --enable-led \
        --enable-pkcs11=yes \
-       --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \
-       --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \
+       --enable-kernel-netlink=yes \
+       --enable-socket-default=yes \
        --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \
        --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \
        --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \

diff --git a/package/tcl/Config.in b/package/tcl/Config.in
index 11d46d36a27ae81a06373e2a73da583305b6fa0a..63d1b256198eebabb9cfb93d801d754acf60f1dd 100644 (file)
--- a/package/tcl/Config.in
+++ b/package/tcl/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_TCL
        bool "tcl"
        # fork()
        depends on BR2_USE_MMU
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        # See this mailing list thread:
        # http://lists.busybox.net/pipermail/buildroot/2015-March/121198.html
@@ -12,10 +11,9 @@ config BR2_PACKAGE_TCL
 
          http://www.tcl.tk
 
-comment "tcl needs a toolchain w/ ipv6, threads, dynamic library"
+comment "tcl needs a toolchain w/ threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS || \
-               BR2_STATIC_LIBS
+       depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
 
 if BR2_PACKAGE_TCL
 

diff --git a/package/tftpd/tftpd.mk b/package/tftpd/tftpd.mk
index 778d45fd8585ef6049a2f4810c1afcc8ab87a0f1..78df835aa554353128fc18775747500c5786de4e 100644 (file)
--- a/package/tftpd/tftpd.mk
+++ b/package/tftpd/tftpd.mk
@@ -9,10 +9,6 @@ TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz
 TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa
 TFTPD_CONF_OPTS = --without-tcpwrappers
 
-ifneq ($(BR2_INET_IPV6),y)
-TFTPD_CONF_OPTS += --without-ipv6
-endif
-
 # Override BusyBox implementations if BusyBox is enabled.
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
 TFTPD_DEPENDENCIES += busybox

diff --git a/package/tovid/Config.in b/package/tovid/Config.in
index 11c808553a28946bd537bacdaf43021838d91fdf..ccf031e8a6c0773c5d1efc8c29e97fbdc78664ee 100644 (file)
--- a/package/tovid/Config.in
+++ b/package/tovid/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_TOVID
        bool "tovid"
        depends on BR2_USE_MMU # fork()
        depends on BR2_TOOLCHAIN_HAS_THREADS
-       depends on BR2_INET_IPV6 # ffmpeg
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_USE_WCHAR
        depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
@@ -28,11 +27,11 @@ config BR2_PACKAGE_TOVID
 
          http://tovid.wikia.com/wiki/Installing_tovid
 
-comment "tovid needs a toolchain w/ threads, IPv6, C++, wchar"
+comment "tovid needs a toolchain w/ threads, C++, wchar"
        depends on BR2_USE_MMU
        depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS
        depends on !BR2_TOOLCHAIN_HAS_THREADS \
-               || !BR2_INET_IPV6 || !BR2_INSTALL_LIBSTDCPP \
+               || !BR2_INSTALL_LIBSTDCPP \
                || !BR2_USE_WCHAR
 
 comment "tovid depends on python or python3"

diff --git a/package/transmission/Config.in b/package/transmission/Config.in
index 5d37309eef25ef84b17cb73b006ffcb558a74b04..b47c36fdd3fa451759de3b6a3cde37a7d38f9407 100644 (file)
--- a/package/transmission/Config.in
+++ b/package/transmission/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_TRANSMISSION
        bool "transmission"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS
        depends on BR2_USE_MMU # fork()
        select BR2_PACKAGE_ZLIB
@@ -48,6 +47,6 @@ comment "transmission-gtk needs a toolchain w/ locale"
        depends on BR2_PACKAGE_LIBGTK2 && !BR2_ENABLE_LOCALE
 endif
 
-comment "transmission needs a toolchain w/ IPv6, threads"
+comment "transmission needs a toolchain w/ threads"
        depends on BR2_USE_MMU
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_TOOLCHAIN_HAS_THREADS

diff --git a/package/trinity/trinity.mk b/package/trinity/trinity.mk
index ecd82f8a47cce8966fc8274b97d05a3b704edc22..211f1b61699dbcb3ea517bfe5057a994e3684f89 100644 (file)
--- a/package/trinity/trinity.mk
+++ b/package/trinity/trinity.mk
@@ -9,10 +9,6 @@ TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION))
 TRINITY_LICENSE = GPLv2
 TRINITY_LICENSE_FILES = COPYING
 
-ifeq ($(BR2_INET_IPV6),)
-TARGET_CONFIGURE_OPTS += IPV6=no
-endif
-
 define TRINITY_CONFIGURE_CMDS
        (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.sh)
 endef

diff --git a/package/tvheadend/Config.in b/package/tvheadend/Config.in
index 27138ec34dd5756c7602a051d267fb76141d34b1..4edf0145198905bb0441130a31113109cf65dc1c 100644 (file)
--- a/package/tvheadend/Config.in
+++ b/package/tvheadend/Config.in
@@ -1,9 +1,8 @@
-comment "tvheadend needs a toolchain w/ IPv6, NPTL, headers >= 3.2"
-       depends on !BR2_INET_IPV6 || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
+comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2"
+       depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
 
 config BR2_PACKAGE_TVHEADEND
        bool "tvheadend"
-       depends on BR2_INET_IPV6
        depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
        depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2
        select BR2_PACKAGE_DTV_SCAN_TABLES

diff --git a/package/ulogd/Config.in b/package/ulogd/Config.in
index 709240925ac164c628f763701b0fe1a1bbb074be..bcd7d0d12bf8a9bc5f36bba65ac83cb8460265da 100644 (file)
--- a/package/ulogd/Config.in
+++ b/package/ulogd/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_ULOGD
        bool "ulogd"
-       depends on BR2_INET_IPV6
        depends on !BR2_STATIC_LIBS
        depends on BR2_USE_MMU
        # ulog support removed for kernels >= 3.17
@@ -15,7 +14,7 @@ config BR2_PACKAGE_ULOGD
 
          http://www.netfilter.org/projects/ulogd/
 
-comment "ulogd needs a toolchain w/ IPv6, dynamic library"
-       depends on !BR2_INET_IPV6 || BR2_STATIC_LIBS
+comment "ulogd needs a toolchain w/ dynamic library"
+       depends on BR2_STATIC_LIBS
        depends on BR2_USE_MMU
        depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17

diff --git a/package/ussp-push/Config.in b/package/ussp-push/Config.in
index c3f6b8632aa7404792361388cfbc4df8889e0752..e6695bb197c92656dcde2d21c7725aea90ef8ad5 100644 (file)
--- a/package/ussp-push/Config.in
+++ b/package/ussp-push/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_USSP_PUSH
        bool "ussp-push"
-       depends on BR2_INET_IPV6
        depends on !BR2_STATIC_LIBS # bluez_utils
        depends on BR2_USE_WCHAR # libglib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2
@@ -14,6 +13,6 @@ config BR2_PACKAGE_USSP_PUSH
 
          http://www.xmailserver.org/ussp-push.html
 
-comment "ussp-push needs a toolchain w/ wchar, IPv6, threads, dynamic library"
+comment "ussp-push needs a toolchain w/ wchar, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INET_IPV6 || BR2_STATIC_LIBS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS

diff --git a/package/x11vnc/x11vnc.mk b/package/x11vnc/x11vnc.mk
index 57d6f8dba0448879a8ff4ff0098401dfdc4b2978..cdb323788c65018cacddf0d97d8e03f2ce34be28 100644 (file)
--- a/package/x11vnc/x11vnc.mk
+++ b/package/x11vnc/x11vnc.mk
@@ -13,12 +13,6 @@ X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst
 X11VNC_LICENSE = GPLv2+
 X11VNC_LICENSE_FILES = COPYING
 
-ifneq ($(BR2_INET_IPV6),y)
-# configure option only used for libvncserver
-X11VNC_CONF_OPTS += --without-ipv6
-X11VNC_CONF_ENV += CFLAGS='$(TARGET_CFLAGS) -DX11VNC_IPV6=0'
-endif
-
 ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy)
 X11VNC_DEPENDENCIES += avahi dbus
 else

diff --git a/package/zeromq/Config.in b/package/zeromq/Config.in
index d44af60b506e9df9adac7a2113da9c7cb20ba011..00fc04874ec98a7aa87afa2860d9400af2faea69 100644 (file)
--- a/package/zeromq/Config.in
+++ b/package/zeromq/Config.in
@@ -1,11 +1,10 @@
-comment "zeromq needs a toolchain w/ C++, IPv6, wchar, threads"
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \
-               BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "zeromq needs a toolchain w/ C++, wchar, threads"
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+               BR2_TOOLCHAIN_HAS_THREADS)
 
 config BR2_PACKAGE_ZEROMQ
        bool "zeromq"
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_INET_IPV6
        depends on BR2_USE_WCHAR # util-linux
        depends on BR2_TOOLCHAIN_HAS_THREADS
        select BR2_PACKAGE_UTIL_LINUX

diff --git a/package/zmqpp/Config.in b/package/zmqpp/Config.in
index d92a37a4f8f521693156854e87229394dd740060..f3d10c93339bfeb7002efba9abb3962d9a2592ab 100644 (file)
--- a/package/zmqpp/Config.in
+++ b/package/zmqpp/Config.in
@@ -6,7 +6,6 @@ config BR2_PACKAGE_ZMQPP
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 # c++0x support
        depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201009 # c++0x support
        depends on BR2_INSTALL_LIBSTDCPP
-       depends on BR2_INET_IPV6 # zeromq
        depends on BR2_USE_WCHAR # util-linux
        depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
        select BR2_PACKAGE_ZEROMQ
@@ -18,9 +17,9 @@ config BR2_PACKAGE_ZMQPP
 
          http://github.com/benjamg/zmqpp
 
-comment "zmqpp needs a toolchain w/ C++, IPv6, wchar, threads"
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \
-               BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+comment "zmqpp needs a toolchain w/ C++, wchar, threads"
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+               BR2_TOOLCHAIN_HAS_THREADS)
 
 if BR2_PACKAGE_ZMQPP
 

diff --git a/package/zyre/Config.in b/package/zyre/Config.in
index 14075f0e74049eddd4fcc41d07cb505501e974ce..95cbf95bb47fe6f37d84988181960b5c76d5fd9f 100644 (file)
--- a/package/zyre/Config.in
+++ b/package/zyre/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_ZYRE
        bool "zyre"
        depends on BR2_INSTALL_LIBSTDCPP # zeromq
-       depends on BR2_INET_IPV6 # zeromq
        depends on BR2_USE_WCHAR # zeromq
        depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
        depends on BR2_USE_MMU # czmq
@@ -16,8 +15,8 @@ config BR2_PACKAGE_ZYRE
 
          http://zyre.org
 
-comment "zyre needs a toolchain w/ C++, IPv6, wchar, threads"
+comment "zyre needs a toolchain w/ C++, wchar, threads"
        depends on BR2_USE_MMU
        depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2
-       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_INET_IPV6 && \
-               BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS)
+       depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && \
+               BR2_TOOLCHAIN_HAS_THREADS)