[Buildroot] [PATCH 01/14] toolchain/helpers: make IPv6 mandatory for uclibc toolchains

[Buildroot] [PATCH 01/14] toolchain/helpers: make IPv6 mandatory for uclibc toolchains

[Gustavo Zacarias]

As previously discussed drop the non-IPv6 option for toolchains.
The size delta is about 10 KiB and it just complicates package
dependencies.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 toolchain/helpers.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
index 257fab2..cb3b61a 100644
--- a/toolchain/helpers.mk
+++ b/toolchain/helpers.mk
@@ -284,7 +284,7 @@ check_uclibc = \
 	UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \
 	$(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\
-	$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
+	$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
 	$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
-- 
2.0.5

[Buildroot] [PATCH 02/14] package/uclibc: default to Y for IPv6

[Gustavo Zacarias]

This will allow us to remove IPv6 handling in the tree without breaking
things while doing so.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/uclibc/Config.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index fdf8351..5bd9098 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -87,11 +87,8 @@ config BR2_UCLIBC_CONFIG
 	  If unsure, use the default.
 
 config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
-	bool "Enable IPv6 support"
-	select BR2_INET_IPV6
-	help
-	  Enable this option if you want your toolchain to support
-	  IPv6.
+	bool
+	default y
 
 config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
 	bool "Enable RPC support"
-- 
2.0.5

[Buildroot] [PATCH 02/14] package/uclibc: default to Y for IPv6

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> This will allow us to remove IPv6 handling in the tree without breaking
> things while doing so.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/uclibc/Config.in | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
> index fdf8351..5bd9098 100644
> --- a/package/uclibc/Config.in
> +++ b/package/uclibc/Config.in
> @@ -87,11 +87,8 @@ config BR2_UCLIBC_CONFIG
>  	  If unsure, use the default.
>  
>  config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
> -	bool "Enable IPv6 support"
> -	select BR2_INET_IPV6

You should keep the 'select' until is really is gone.

Otherwise, it means uClibc has IPv6 support, but IPv6-dependent packages
are not selectable, because they depend on BR2_INET_IPV6 which is not
set, even though the C library supports it.

Granted, this is not a big problem, but still.

Regards,
Yann E. MORIN.

> -	help
> -	  Enable this option if you want your toolchain to support
> -	  IPv6.
> +	bool
> +	default y
>  
>  config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
>  	bool "Enable RPC support"
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 03/14] toolchain-common: default to Y for IPv6

[Gustavo Zacarias]

This will allow us to remove IPv6 handling in the tree without breaking
things while doing so.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 toolchain/toolchain-common.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 13c684d..dfb7394 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -7,6 +7,7 @@ source "package/gdb/Config.in.host"
 
 config BR2_INET_IPV6
 	bool
+	default y
 
 config BR2_TOOLCHAIN_HAS_GCC_BUG_58595
 	bool
-- 
2.0.5

[Buildroot] [PATCH 03/14] toolchain-common: default to Y for IPv6

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> This will allow us to remove IPv6 handling in the tree without breaking
> things while doing so.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  toolchain/toolchain-common.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
> index 13c684d..dfb7394 100644
> --- a/toolchain/toolchain-common.in
> +++ b/toolchain/toolchain-common.in
> @@ -7,6 +7,7 @@ source "package/gdb/Config.in.host"
>  
>  config BR2_INET_IPV6
>  	bool
> +	default y

After the re-ordering of the series (i.e. CS sh2 toolchains are removed
before this patch), then you can add my:

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

>  config BR2_TOOLCHAIN_HAS_GCC_BUG_58595
>  	bool
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 04/14] toolchain: remove IPv6 selects

[Gustavo Zacarias]

There's no need for toolchains or the user to declare IPv6 support since
it's now mandatory.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 toolchain/Config.in                    |  2 --
 toolchain/toolchain-external/Config.in | 11 -----------
 2 files changed, 13 deletions(-)

diff --git a/toolchain/Config.in b/toolchain/Config.in
index 32a00a9..a851ce4 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -9,7 +9,6 @@ config BR2_TOOLCHAIN
 # Should be selected for glibc or eglibc
 config BR2_TOOLCHAIN_USES_GLIBC
 	bool
-	select BR2_INET_IPV6
 	select BR2_USE_WCHAR
 	select BR2_ENABLE_LOCALE
 	select BR2_TOOLCHAIN_HAS_THREADS
@@ -23,7 +22,6 @@ config BR2_TOOLCHAIN_USES_UCLIBC
 
 config BR2_TOOLCHAIN_USES_MUSL
 	bool
-	select BR2_INET_IPV6
 	select BR2_USE_WCHAR
 	select BR2_ENABLE_LOCALE
 	select BR2_TOOLCHAIN_HAS_THREADS
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 3b7f40b..a8949c5 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -780,7 +780,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2014R1
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_INSTALL_LIBSTDCPP
-	select BR2_INET_IPV6
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
@@ -797,7 +796,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2013R1
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_INSTALL_LIBSTDCPP
-	select BR2_INET_IPV6
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
@@ -814,7 +812,6 @@ config BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX_2012R2
 	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
 	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
 	select BR2_INSTALL_LIBSTDCPP
-	select BR2_INET_IPV6
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	select BR2_USE_WCHAR
 	select BR2_TOOLCHAIN_HAS_THREADS
@@ -1145,14 +1142,6 @@ endchoice
 
 if BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
 
-config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6
-	bool "Toolchain has IPv6 support?"
-	select BR2_INET_IPV6
-	help
-	  Select this option if your external toolchain supports
-	  IPv6. If you don't know, leave the default value, Buildroot
-	  will tell you if it's correct or not.
-
 config BR2_TOOLCHAIN_EXTERNAL_WCHAR
 	bool "Toolchain has WCHAR support?"
 	select BR2_USE_WCHAR
-- 
2.0.5

[Buildroot] [PATCH 04/14] toolchain: remove IPv6 selects

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> There's no need for toolchains or the user to declare IPv6 support since
> it's now mandatory.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  toolchain/Config.in                    |  2 --
>  toolchain/toolchain-external/Config.in | 11 -----------
>  2 files changed, 13 deletions(-)
> 
> diff --git a/toolchain/Config.in b/toolchain/Config.in
> index 32a00a9..a851ce4 100644
> --- a/toolchain/Config.in
> +++ b/toolchain/Config.in
[--SNIP--]
> @@ -1145,14 +1142,6 @@ endchoice
>  
>  if BR2_TOOLCHAIN_EXTERNAL_CUSTOM_UCLIBC
>  
> -config BR2_TOOLCHAIN_EXTERNAL_INET_IPV6
> -	bool "Toolchain has IPv6 support?"
> -	select BR2_INET_IPV6
> -	help
> -	  Select this option if your external toolchain supports
> -	  IPv6. If you don't know, leave the default value, Buildroot
> -	  will tell you if it's correct or not.

This hunk should be squashed into your first patch (toolchain/helpers:
make IPv6 mandatory for uclibc toolchains).

Regards,
Yann E. MORIN.

>  config BR2_TOOLCHAIN_EXTERNAL_WCHAR
>  	bool "Toolchain has WCHAR support?"
>  	select BR2_USE_WCHAR
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 05/14] toolchain-external: remove CS sh2 toolchains

[Gustavo Zacarias]

Normally we'd deprecate them, but:

1) They don't support IPv6 and it's being removed so it makes no sense.
2) They're based on uClibc 0.9.30-ish which is very old and surely has
package build breakage all over it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 toolchain/toolchain-external/Config.in | 38 ----------------------------------
 1 file changed, 38 deletions(-)

diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index a8949c5..97619d4 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -630,44 +630,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
 	    - SH4A, uClibc, big endian
 	      Not usable in Buildroot yet.
 
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
-	bool "Sourcery CodeBench SH 2011.03"
-	depends on BR2_sh2a
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_USE_WCHAR
-	select BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_HOSTARCH_NEEDS_IA32_LIBS
-	# kernel headers: 2.6.38
-	help
-	  Sourcery CodeBench toolchain for the SuperH architecture,
-	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
-	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.38. It has
-	  support for the following variants:
-	    - SH2A, uClibc, big endian
-
-config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
-	bool "Sourcery CodeBench SH 2010.09"
-	depends on BR2_sh2a
-	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
-	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
-	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	select BR2_USE_WCHAR
-	select BR2_TOOLCHAIN_HAS_THREADS
-	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
-	select BR2_INSTALL_LIBSTDCPP
-	select BR2_HOSTARCH_NEEDS_IA32_LIBS
-	# kernel headers: 2.6.35
-	help
-	  Sourcery CodeBench toolchain for the SuperH architecture,
-	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
-	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.35.2. It
-	  has support for the following variants:
-	    - SH2A, uClibc, big endian
-
 config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_201405
 	bool "Sourcery CodeBench AMD64 2014.05"
 	depends on BR2_x86_64
-- 
2.0.5

[Buildroot] [PATCH 05/14] toolchain-external: remove CS sh2 toolchains

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> Normally we'd deprecate them, but:
> 
> 1) They don't support IPv6 and it's being removed so it makes no sense.
> 2) They're based on uClibc 0.9.30-ish which is very old and surely has
> package build breakage all over it.

This should go in before patch 3 (toolchain-common: default to Y for IPv6)
otherwise you can enable IPv6-dependent packages even with those
toolchains.

Regards,
Yann E. MORIN.

> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  toolchain/toolchain-external/Config.in | 38 ----------------------------------
>  1 file changed, 38 deletions(-)
> 
> diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
> index a8949c5..97619d4 100644
> --- a/toolchain/toolchain-external/Config.in
> +++ b/toolchain/toolchain-external/Config.in
> @@ -630,44 +630,6 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH201103
>  	    - SH4A, uClibc, big endian
>  	      Not usable in Buildroot yet.
>  
> -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201103
> -	bool "Sourcery CodeBench SH 2011.03"
> -	depends on BR2_sh2a
> -	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
> -	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
> -	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
> -	select BR2_USE_WCHAR
> -	select BR2_TOOLCHAIN_HAS_THREADS
> -	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
> -	select BR2_INSTALL_LIBSTDCPP
> -	select BR2_HOSTARCH_NEEDS_IA32_LIBS
> -	# kernel headers: 2.6.38
> -	help
> -	  Sourcery CodeBench toolchain for the SuperH architecture,
> -	  from Mentor Graphics. It uses gcc 4.5.2, binutils 2.20,
> -	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.38. It has
> -	  support for the following variants:
> -	    - SH2A, uClibc, big endian
> -
> -config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH2A_201009
> -	bool "Sourcery CodeBench SH 2010.09"
> -	depends on BR2_sh2a
> -	depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86"
> -	select BR2_TOOLCHAIN_EXTERNAL_UCLIBC
> -	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
> -	select BR2_USE_WCHAR
> -	select BR2_TOOLCHAIN_HAS_THREADS
> -	select BR2_TOOLCHAIN_HAS_THREADS_DEBUG
> -	select BR2_INSTALL_LIBSTDCPP
> -	select BR2_HOSTARCH_NEEDS_IA32_LIBS
> -	# kernel headers: 2.6.35
> -	help
> -	  Sourcery CodeBench toolchain for the SuperH architecture,
> -	  from Mentor Graphics. It uses gcc 4.5.1, binutils 2.20,
> -	  uClibc 0.9.30, gdb 7.2.50 and kernel headers 2.6.35.2. It
> -	  has support for the following variants:
> -	    - SH2A, uClibc, big endian
> -
>  config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_AMD64_201405
>  	bool "Sourcery CodeBench AMD64 2014.05"
>  	depends on BR2_x86_64
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 06/14] package infra: drop non-IPv6 support

[Gustavo Zacarias]

Now that IPv6 is mandatory remove support for non-IPv6 tweaks/variables
in the package infra.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/Makefile.in      | 6 ------
 package/pkg-autotools.mk | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/package/Makefile.in b/package/Makefile.in
index e65e08b..a0c5a7a 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -369,12 +369,6 @@ else
 DISABLE_NLS :=--disable-nls
 endif
 
-ifeq ($(BR2_INET_IPV6),y)
-DISABLE_IPV6 = --enable-ipv6
-else
-DISABLE_IPV6 = --disable-ipv6
-endif
-
 ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
 TARGET_CONFIGURE_OPTS += CXX=false
 endif
diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
index 2ecf7d8..49b42d4 100644
--- a/package/pkg-autotools.mk
+++ b/package/pkg-autotools.mk
@@ -200,8 +200,8 @@ define $(2)_CONFIGURE_CMDS
 		--with-xmlto=no \
 		--with-fop=no \
 		--disable-dependency-tracking \
+		--enable-ipv6 \
 		$$(DISABLE_NLS) \
-		$$(DISABLE_IPV6) \
 		$$(ENABLE_DEBUG) \
 		$$(SHARED_STATIC_LIBS_OPTS) \
 		$$(QUIET) $$($$(PKG)_CONF_OPTS) \
-- 
2.0.5

[Buildroot] [PATCH 06/14] package infra: drop non-IPv6 support

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> Now that IPv6 is mandatory remove support for non-IPv6 tweaks/variables
> in the package infra.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

You're missing one instance of DISABLE_IPV6 in netsnmp:

    NETSNMP_CONF_OPTS = \
        [--SNIP--]
        --without-kmem-usage $(DISABLE_IPV6) \
        [--SNIP--]

which should just be removed entirely I guess.

Regards,
Yann E. MORIN.

> ---
>  package/Makefile.in      | 6 ------
>  package/pkg-autotools.mk | 2 +-
>  2 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/package/Makefile.in b/package/Makefile.in
> index e65e08b..a0c5a7a 100644
> --- a/package/Makefile.in
> +++ b/package/Makefile.in
> @@ -369,12 +369,6 @@ else
>  DISABLE_NLS :=--disable-nls
>  endif
>  
> -ifeq ($(BR2_INET_IPV6),y)
> -DISABLE_IPV6 = --enable-ipv6
> -else
> -DISABLE_IPV6 = --disable-ipv6
> -endif
> -
>  ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
>  TARGET_CONFIGURE_OPTS += CXX=false
>  endif
> diff --git a/package/pkg-autotools.mk b/package/pkg-autotools.mk
> index 2ecf7d8..49b42d4 100644
> --- a/package/pkg-autotools.mk
> +++ b/package/pkg-autotools.mk
> @@ -200,8 +200,8 @@ define $(2)_CONFIGURE_CMDS
>  		--with-xmlto=no \
>  		--with-fop=no \
>  		--disable-dependency-tracking \
> +		--enable-ipv6 \
>  		$$(DISABLE_NLS) \
> -		$$(DISABLE_IPV6) \
>  		$$(ENABLE_DEBUG) \
>  		$$(SHARED_STATIC_LIBS_OPTS) \
>  		$$(QUIET) $$($$(PKG)_CONF_OPTS) \
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 07/14] configs: drop redundant IPv6 option

[Gustavo Zacarias]

Drop the buildroot toolchain IPv6 option from the only config that's got
it since it's now a non-option.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 configs/armadeus_apf9328_defconfig | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/armadeus_apf9328_defconfig b/configs/armadeus_apf9328_defconfig
index 3ad8feb..d6388db 100644
--- a/configs/armadeus_apf9328_defconfig
+++ b/configs/armadeus_apf9328_defconfig
@@ -6,7 +6,6 @@ BR2_arm920t=y
 BR2_PACKAGE_GDB=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_ENABLE_LOCALE_PURGE=y
-BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
 BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
 BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
-- 
2.0.5

[Buildroot] [PATCH 07/14] configs: drop redundant IPv6 option

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> Drop the buildroot toolchain IPv6 option from the only config that's got
> it since it's now a non-option.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  configs/armadeus_apf9328_defconfig | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/configs/armadeus_apf9328_defconfig b/configs/armadeus_apf9328_defconfig
> index 3ad8feb..d6388db 100644
> --- a/configs/armadeus_apf9328_defconfig
> +++ b/configs/armadeus_apf9328_defconfig
> @@ -6,7 +6,6 @@ BR2_arm920t=y
>  BR2_PACKAGE_GDB=y
>  BR2_PACKAGE_HOST_GDB=y
>  BR2_ENABLE_LOCALE_PURGE=y
> -BR2_TOOLCHAIN_BUILDROOT_INET_IPV6=y
>  BR2_TOOLCHAIN_BUILDROOT_INET_RPC=y
>  BR2_TOOLCHAIN_BUILDROOT_LOCALE=y
>  BR2_TOOLCHAIN_BUILDROOT_CXX=y
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 08/14] busybox: force ipv6 build

[Gustavo Zacarias]

Since it isn't optional any more just force IPv6 on in busybox to avoid
problems.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/busybox/busybox.mk | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
index 95fdfec..1ce508a 100644
--- a/package/busybox/busybox.mk
+++ b/package/busybox/busybox.mk
@@ -97,18 +97,10 @@ define BUSYBOX_SET_LARGEFILE
 	$(call KCONFIG_ENABLE_OPT,CONFIG_FDISK_SUPPORT_LARGE_DISKS,$(BUSYBOX_BUILD_CONFIG))
 endef
 
-# If IPv6 is enabled then enable basic ifupdown support for it
-ifeq ($(BR2_INET_IPV6),y)
 define BUSYBOX_SET_IPV6
 	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG))
 	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
 endef
-else
-define BUSYBOX_SET_IPV6
-	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG))
-	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
-endef
-endif
 
 # If we're using static libs do the same for busybox
 ifeq ($(BR2_STATIC_LIBS),y)
-- 
2.0.5

[Buildroot] [PATCH 08/14] busybox: force ipv6 build

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> Since it isn't optional any more just force IPv6 on in busybox to avoid
> problems.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/busybox/busybox.mk | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk
> index 95fdfec..1ce508a 100644
> --- a/package/busybox/busybox.mk
> +++ b/package/busybox/busybox.mk
> @@ -97,18 +97,10 @@ define BUSYBOX_SET_LARGEFILE
>  	$(call KCONFIG_ENABLE_OPT,CONFIG_FDISK_SUPPORT_LARGE_DISKS,$(BUSYBOX_BUILD_CONFIG))
>  endef
>  
> -# If IPv6 is enabled then enable basic ifupdown support for it
> -ifeq ($(BR2_INET_IPV6),y)
>  define BUSYBOX_SET_IPV6
>  	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG))
>  	$(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
>  endef
> -else
> -define BUSYBOX_SET_IPV6
> -	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IPV6,$(BUSYBOX_BUILD_CONFIG))
> -	$(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_IFUPDOWN_IPV6,$(BUSYBOX_BUILD_CONFIG))
> -endef
> -endif
>  
>  # If we're using static libs do the same for busybox
>  ifeq ($(BR2_STATIC_LIBS),y)
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 09/14] system: drop IPv6 depend for systemd

[Gustavo Zacarias]

It's no longer an option so it must be dropped.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 system/Config.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/system/Config.in b/system/Config.in
index 431524d..84cde94 100644
--- a/system/Config.in
+++ b/system/Config.in
@@ -81,7 +81,6 @@ config BR2_INIT_SYSTEMD
 	depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
 	depends on BR2_TOOLCHAIN_USES_GLIBC
 	depends on BR2_USE_WCHAR
-	depends on BR2_INET_IPV6
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HAS_SSP
 	depends on BR2_USE_MMU
-- 
2.0.5

[Buildroot] [PATCH 09/14] system: drop IPv6 depend for systemd

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> It's no longer an option so it must be dropped.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  system/Config.in | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/system/Config.in b/system/Config.in
> index 431524d..84cde94 100644
> --- a/system/Config.in
> +++ b/system/Config.in
> @@ -81,7 +81,6 @@ config BR2_INIT_SYSTEMD
>  	depends on BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS
>  	depends on BR2_TOOLCHAIN_USES_GLIBC
>  	depends on BR2_USE_WCHAR
> -	depends on BR2_INET_IPV6

I know you're taking care of that in a followup patch, but it seems
weird that you drop the dependency here in the system option, but keep
it in the systemd package, even though it is selected.

I would also remove the dependency in systemd at the same time; or push
this patch after the packages have been cleaned up (I'd prfefer the
first solution, though).

Regards,
Yann E. MORIN.

>  	depends on BR2_TOOLCHAIN_HAS_THREADS
>  	depends on BR2_TOOLCHAIN_HAS_SSP
>  	depends on BR2_USE_MMU
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 10/14] docs/manual: remove references to IPv6

[Gustavo Zacarias]

It's no longer an option so remove all references to it.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 docs/manual/adding-packages-directory.txt | 11 +++--------
 docs/manual/configure.txt                 | 10 +++++-----
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
index f536a0c..639003f 100644
--- a/docs/manual/adding-packages-directory.txt
+++ b/docs/manual/adding-packages-directory.txt
@@ -207,10 +207,9 @@ coding style].
 ==== Dependencies on target and toolchain options
 
 Many packages depend on certain options of the toolchain: the choice of
-C library, C++ support, thread support, RPC support, IPv6 support,
-wchar support, or dynamic library support. Some packages can only be
-built on certain target architectures, or if an MMU is available in the
-processor.
+C library, C++ support, thread support, RPC support, wchar support,
+or dynamic library support. Some packages can only be built on certain
+target architectures, or if an MMU is available in the processor.
 
 These dependencies have to be expressed with the appropriate 'depends
 on' statements in the Config.in file. Additionally, for dependencies on
@@ -301,10 +300,6 @@ use in the comment.
 ** Dependency symbol: +BR2_TOOLCHAIN_HAS_NATIVE_RPC+
 ** Comment string: +RPC+
 
-* IPv6 support
-** Dependency symbol: +BR2_INET_IPV6+
-** Comment string: +IPv6+ (lowercase v)
-
 * wchar support
 ** Dependency symbol: +BR2_USE_WCHAR+
 ** Comment string: +wchar+
diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
index c06182b..dd34eef 100644
--- a/docs/manual/configure.txt
+++ b/docs/manual/configure.txt
@@ -109,8 +109,8 @@ most important ones allow to:
  * Change the version of the GCC compiler, binutils and the C library.
 
  * Select a number of toolchain options (uClibc only): whether the
-   toolchain should have IPv6 support, RPC support (used mainly for
-   NFS), wide-char support, locale support (for internationalization),
+   toolchain should have RPC support (used mainly for NFS),
+   wide-char support, locale support (for internationalization),
    C++ support or thread support. Depending on which options you choose,
    the number of userspace applications and libraries visible in
    Buildroot menus will change: many applications and libraries require
@@ -177,9 +177,9 @@ Then, you have three solutions to use an external toolchain:
   external toolchain uses the 'glibc' library, you only have to tell
   whether your toolchain supports C\++ or not and whether it has
   built-in RPC support. If your external toolchain uses the 'uClibc'
-  library, then you have to tell Buildroot if it supports IPv6,
-  RPC, wide-char, locale, program invocation, threads and
-  C++. At the beginning of the execution, Buildroot will tell you if
+  library, then you have to tell Buildroot if it supports RPC,
+  wide-char, locale, program invocation, threads and C++.
+  At the beginning of the execution, Buildroot will tell you if
   the selected options do not match the toolchain configuration.
 
 Our external toolchain support has been tested with toolchains from
-- 
2.0.5

[Buildroot] [PATCH 10/14] docs/manual: remove references to IPv6

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> It's no longer an option so remove all references to it.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  docs/manual/adding-packages-directory.txt | 11 +++--------
>  docs/manual/configure.txt                 | 10 +++++-----
>  2 files changed, 8 insertions(+), 13 deletions(-)
> 
> diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt
> index f536a0c..639003f 100644
> --- a/docs/manual/adding-packages-directory.txt
> +++ b/docs/manual/adding-packages-directory.txt
> @@ -207,10 +207,9 @@ coding style].
>  ==== Dependencies on target and toolchain options
>  
>  Many packages depend on certain options of the toolchain: the choice of
> -C library, C++ support, thread support, RPC support, IPv6 support,
> -wchar support, or dynamic library support. Some packages can only be
> -built on certain target architectures, or if an MMU is available in the
> -processor.
> +C library, C++ support, thread support, RPC support, wchar support,
> +or dynamic library support. Some packages can only be built on certain
> +target architectures, or if an MMU is available in the processor.
>  
>  These dependencies have to be expressed with the appropriate 'depends
>  on' statements in the Config.in file. Additionally, for dependencies on
> @@ -301,10 +300,6 @@ use in the comment.
>  ** Dependency symbol: +BR2_TOOLCHAIN_HAS_NATIVE_RPC+
>  ** Comment string: +RPC+
>  
> -* IPv6 support
> -** Dependency symbol: +BR2_INET_IPV6+
> -** Comment string: +IPv6+ (lowercase v)
> -
>  * wchar support
>  ** Dependency symbol: +BR2_USE_WCHAR+
>  ** Comment string: +wchar+
> diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
> index c06182b..dd34eef 100644
> --- a/docs/manual/configure.txt
> +++ b/docs/manual/configure.txt
> @@ -109,8 +109,8 @@ most important ones allow to:
>   * Change the version of the GCC compiler, binutils and the C library.
>  
>   * Select a number of toolchain options (uClibc only): whether the
> -   toolchain should have IPv6 support, RPC support (used mainly for
> -   NFS), wide-char support, locale support (for internationalization),
> +   toolchain should have RPC support (used mainly for NFS),
> +   wide-char support, locale support (for internationalization),
>     C++ support or thread support. Depending on which options you choose,
>     the number of userspace applications and libraries visible in
>     Buildroot menus will change: many applications and libraries require
> @@ -177,9 +177,9 @@ Then, you have three solutions to use an external toolchain:
>    external toolchain uses the 'glibc' library, you only have to tell
>    whether your toolchain supports C\++ or not and whether it has
>    built-in RPC support. If your external toolchain uses the 'uClibc'
> -  library, then you have to tell Buildroot if it supports IPv6,
> -  RPC, wide-char, locale, program invocation, threads and
> -  C++. At the beginning of the execution, Buildroot will tell you if
> +  library, then you have to tell Buildroot if it supports RPC,
> +  wide-char, locale, program invocation, threads and C++.
> +  At the beginning of the execution, Buildroot will tell you if
>    the selected options do not match the toolchain configuration.
>  
>  Our external toolchain support has been tested with toolchains from
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 11/14] packages: remove non-IPv6 enabler patches

[Gustavo Zacarias]

These are no longer required so remove them.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/avahi/0003-ipv6only.patch                  |  19 --
 package/avahi/0005-optional-ipv6.patch             | 147 --------------
 package/iproute2/0001-optional-ipv6.patch          |  89 ---------
 package/iproute2/0002-vxlan-optional-ipv6.patch    |  83 --------
 package/libeXosip2/0001-fix-non-ipv6-build.patch   |  22 ---
 package/libglib2/0001-optional-ipv6.patch          | 195 ------------------
 package/libnice/0001-build-IPV6_RECVERR.patch      |  20 --
 .../libtirpc/0003-Make-IPv6-support-optional.patch |  26 ---
 package/luasocket/0001-uClibc-IPv6.patch           | 217 ---------------------
 package/perl/0001-uClibc-IPv6.patch                |  61 ------
 package/rpcbind/0003-Make-IPv6-configurable.patch  |  42 ----
 package/rpcbind/rpcbind.mk                         |   1 -
 package/x11vnc/0001-ipv6.patch                     |  25 ---
 13 files changed, 947 deletions(-)
 delete mode 100644 package/avahi/0003-ipv6only.patch
 delete mode 100644 package/avahi/0005-optional-ipv6.patch
 delete mode 100644 package/iproute2/0001-optional-ipv6.patch
 delete mode 100644 package/iproute2/0002-vxlan-optional-ipv6.patch
 delete mode 100644 package/libeXosip2/0001-fix-non-ipv6-build.patch
 delete mode 100644 package/libglib2/0001-optional-ipv6.patch
 delete mode 100644 package/libnice/0001-build-IPV6_RECVERR.patch
 delete mode 100644 package/libtirpc/0003-Make-IPv6-support-optional.patch
 delete mode 100644 package/luasocket/0001-uClibc-IPv6.patch
 delete mode 100644 package/perl/0001-uClibc-IPv6.patch
 delete mode 100644 package/rpcbind/0003-Make-IPv6-configurable.patch
 delete mode 100644 package/x11vnc/0001-ipv6.patch

diff --git a/package/avahi/0003-ipv6only.patch b/package/avahi/0003-ipv6only.patch
deleted file mode 100644
index 8cc3cb9..0000000
--- a/package/avahi/0003-ipv6only.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -urpN avahi-0.6.22.orig/avahi-core/socket.c avahi-0.6.22/avahi-core/socket.c
---- avahi-0.6.22.orig/avahi-core/socket.c	2007-12-16 22:03:08.000000000 +0100
-+++ avahi-0.6.22/avahi-core/socket.c	2008-03-31 17:13:24.000000000 +0200
-@@ -394,13 +394,13 @@ int avahi_open_socket_ipv6(int no_reuse)
-         avahi_log_warn("IPV6_UNICAST_HOPS failed: %s", strerror(errno));
-         goto fail;
-     }
--
-+#ifdef IPV6_V6ONLY
-     yes = 1;
-     if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &yes, sizeof(yes)) < 0) {
-         avahi_log_warn("IPV6_V6ONLY failed: %s", strerror(errno));
-         goto fail;
-     }
--
-+#endif
-     yes = 1;
-     if (setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &yes, sizeof(yes)) < 0) {
-         avahi_log_warn("IPV6_MULTICAST_LOOP failed: %s", strerror(errno));
diff --git a/package/avahi/0005-optional-ipv6.patch b/package/avahi/0005-optional-ipv6.patch
deleted file mode 100644
index 5caf87c..0000000
--- a/package/avahi/0005-optional-ipv6.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-[PATCH] avahi-core: make ipv6 support optional on uclibc 0.9.31+
-
-uClibc 0.9.31+ doesn't define the IPV6_* defines when IPv6 support isn't
-enabled, causing the avahi build to break. Detect this configuration, and
-comment out IPv6 code if so.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- avahi-core/socket.c |   28 +++++++++++++++++++++++-----
- 1 file changed, 23 insertions(+), 5 deletions(-)
-
-Index: avahi-0.6.23/avahi-core/socket.c
-===================================================================
---- avahi-0.6.23.orig/avahi-core/socket.c
-+++ avahi-0.6.23/avahi-core/socket.c
-@@ -47,6 +47,11 @@
- #include <net/if_dl.h>
- #endif
- 
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-+
- #include "dns.h"
- #include "fdutil.h"
- #include "socket.h"
-@@ -75,6 +80,7 @@ static void mdns_mcast_group_ipv4(struct
-     inet_pton(AF_INET, AVAHI_IPV4_MCAST_GROUP, &ret_sa->sin_addr);
- }
- 
-+#ifndef NO_IPV6
- static void mdns_mcast_group_ipv6(struct sockaddr_in6 *ret_sa) {
-     assert(ret_sa);
- 
-@@ -83,6 +89,7 @@ static void mdns_mcast_group_ipv6(struct
-     ret_sa->sin6_port = htons(AVAHI_MDNS_PORT);
-     inet_pton(AF_INET6, AVAHI_IPV6_MCAST_GROUP, &ret_sa->sin6_addr);
- }
-+#endif
- 
- static void ipv4_address_to_sockaddr(struct sockaddr_in *ret_sa, const AvahiIPv4Address *a, uint16_t port) {
-     assert(ret_sa);
-@@ -95,6 +102,7 @@ static void ipv4_address_to_sockaddr(str
-     memcpy(&ret_sa->sin_addr, a, sizeof(AvahiIPv4Address));
- }
- 
-+#ifndef NO_IPV6
- static void ipv6_address_to_sockaddr(struct sockaddr_in6 *ret_sa, const AvahiIPv6Address *a, uint16_t port) {
-     assert(ret_sa);
-     assert(a);
-@@ -105,6 +113,7 @@ static void ipv6_address_to_sockaddr(str
-     ret_sa->sin6_port = htons(port);
-     memcpy(&ret_sa->sin6_addr, a, sizeof(AvahiIPv6Address));
- }
-+#endif
- 
- int avahi_mdns_mcast_join_ipv4(int fd, const AvahiIPv4Address *a, int idx, int join) {
- #ifdef HAVE_STRUCT_IP_MREQN
-@@ -143,6 +152,7 @@ int avahi_mdns_mcast_join_ipv4(int fd, c
- }
- 
- int avahi_mdns_mcast_join_ipv6(int fd, const AvahiIPv6Address *a, int idx, int join) {
-+#ifndef NO_IPV6
-     struct ipv6_mreq mreq6;
-     struct sockaddr_in6 sa6;
- 
-@@ -164,6 +174,9 @@ int avahi_mdns_mcast_join_ipv6(int fd, c
-     }
- 
-     return 0;
-+#else
-+    return -1;
-+#endif
- }
- 
- static int reuseaddr(int fd) {
-@@ -372,6 +385,7 @@ fail:
- }
- 
- int avahi_open_socket_ipv6(int no_reuse) {
-+#ifndef NO_IPV6
-     struct sockaddr_in6 sa, local;
-     int fd = -1, yes, r;
-     int ttl;
-@@ -437,7 +451,7 @@ int avahi_open_socket_ipv6(int no_reuse)
- fail:
-     if (fd >= 0)
-         close(fd);
--
-+#endif
-     return -1;
- }
- 
-@@ -567,7 +581,7 @@ int avahi_send_dns_packet_ipv6(
-         const AvahiIPv6Address *src_address,
-         const AvahiIPv6Address *dst_address,
-         uint16_t dst_port) {
--
-+#ifndef NO_IPV6
-     struct sockaddr_in6 sa;
-     struct msghdr msg;
-     struct iovec io;
-@@ -620,6 +634,9 @@ int avahi_send_dns_packet_ipv6(
-     }
- 
-     return sendmsg_loop(fd, &msg, 0);
-+#else
-+    return -1;
-+#endif
- }
- 
- AvahiDnsPacket *avahi_recv_dns_packet_ipv4(
-@@ -782,7 +799,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip
-         AvahiIPv6Address *ret_dst_address,
-         AvahiIfIndex *ret_iface,
-         uint8_t *ret_ttl) {
--
-+#ifndef NO_IPV6
-     AvahiDnsPacket *p = NULL;
-     struct msghdr msg;
-     struct iovec io;
-@@ -889,7 +906,7 @@ AvahiDnsPacket *avahi_recv_dns_packet_ip
- fail:
-     if (p)
-         avahi_dns_packet_free(p);
--
-+#endif
-     return NULL;
- }
- 
-@@ -934,6 +951,7 @@ fail:
- }
- 
- int avahi_open_unicast_socket_ipv6(void) {
-+#ifndef NO_IPV6
-     struct sockaddr_in6 local;
-     int fd = -1, yes;
- 
-@@ -974,6 +992,6 @@ int avahi_open_unicast_socket_ipv6(void)
- fail:
-     if (fd >= 0)
-         close(fd);
--
-+#endif
-     return -1;
- }
diff --git a/package/iproute2/0001-optional-ipv6.patch b/package/iproute2/0001-optional-ipv6.patch
deleted file mode 100644
index c51f695..0000000
--- a/package/iproute2/0001-optional-ipv6.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-[PATCH] fix build on uClibc without IPv6 support
-
-Disable IPv6 support code when building with uClibc configured without IPv6
-support.
-
-[Gustavo: update for iproute2 3.10.0]
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura iproute2-3.10.0.orig/ip/ip6tunnel.c iproute2-3.10.0/ip/ip6tunnel.c
---- iproute2-3.10.0.orig/ip/ip6tunnel.c	2013-08-14 09:17:56.538089916 -0300
-+++ iproute2-3.10.0/ip/ip6tunnel.c	2013-08-14 09:18:02.952298534 -0300
-@@ -20,6 +20,10 @@
-  *	Masahide NAKAMURA @USAGI
-  */
-
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#else
-+
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -425,3 +429,5 @@
- 	fprintf(stderr, "Command \"%s\" is unknown, try \"ip -f inet6 tunnel help\".\n", *argv);
- 	exit(-1);
- }
-+
-+#endif /* no ipv6 */
-diff -Nura iproute2-3.10.0.orig/ip/ipprefix.c iproute2-3.10.0/ip/ipprefix.c
---- iproute2-3.10.0.orig/ip/ipprefix.c	2013-08-14 09:17:56.539089949 -0300
-+++ iproute2-3.10.0/ip/ipprefix.c	2013-08-14 09:19:29.065099291 -0300
-@@ -23,11 +23,18 @@
-  *	Masahide NAKAMURA @USAGI
-  */
-
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <sys/socket.h>
-+#ifndef NO_IPV6
- #include <netinet/icmp6.h>
-+#endif
-
- #include "utils.h"
- #include "ip_common.h"
-@@ -65,10 +72,12 @@
- 		fprintf(stderr, "incorrect protocol family: %d\n", prefix->prefix_family);
- 		return 0;
- 	}
-+#ifdef ND_OPT_PREFIX_INFORMATION
- 	if (prefix->prefix_type != ND_OPT_PREFIX_INFORMATION) {
- 		fprintf(stderr, "wrong ND type %d\n", prefix->prefix_type);
- 		return 0;
- 	}
-+#endif
-
- 	parse_rtattr(tb, RTA_MAX, RTM_RTA(prefix), len);
-
-diff -Nura iproute2-3.10.0.orig/ip/iptunnel.c iproute2-3.10.0/ip/iptunnel.c
---- iproute2-3.10.0.orig/ip/iptunnel.c	2013-08-14 09:17:56.538089916 -0300
-+++ iproute2-3.10.0/ip/iptunnel.c	2013-08-14 09:18:02.953298566 -0300
-@@ -9,6 +9,10 @@
-  * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
-  *
-  */
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-
- #include <stdio.h>
- #include <stdlib.h>
-@@ -634,8 +638,10 @@
- 	 * protocol-independent because of unarranged structure between
- 	 * IPv4 and IPv6.
- 	 */
-+#ifndef NO_IPV6
- 	case AF_INET6:
- 		return do_ip6tunnel(argc, argv);
-+#endif
- 	default:
- 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- 		exit(-1);
diff --git a/package/iproute2/0002-vxlan-optional-ipv6.patch b/package/iproute2/0002-vxlan-optional-ipv6.patch
deleted file mode 100644
index 80ea97c..0000000
--- a/package/iproute2/0002-vxlan-optional-ipv6.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-Disable IPv6 support code in vxlan when building with uClibc configured without
-IPv6 support.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
-
-diff -Nura iproute2-3.14.0/ip/iplink_vxlan.c iproute2-3.14.0-noipv6/ip/iplink_vxlan.c
---- iproute2-3.14.0/ip/iplink_vxlan.c	2014-04-11 21:48:41.000000000 -0300
-+++ iproute2-3.14.0-noipv6/ip/iplink_vxlan.c	2014-04-14 08:36:22.638235721 -0300
-@@ -9,6 +9,11 @@
-  * Authors:     Stephen Hemminger <shemminger@vyatta.com
-  */
- 
-+#include <features.h>
-+#if defined(__UCLIBC__) && !defined (__UCLIBC_HAS_IPV6__)
-+#define NO_IPV6
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -188,12 +193,14 @@
- 		return -1;
- 	}
- 
-+#ifndef NO_IPV6
- 	if ((gaddr && daddr) ||
- 		(memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) &&
- 		 memcmp(&daddr6, &in6addr_any, sizeof(daddr6)))) {
- 		fprintf(stderr, "vxlan: both group and remote cannot be specified\n");
- 		return -1;
- 	}
-+#endif
- 
- 	if (!dst_port_set) {
- 		fprintf(stderr, "vxlan: destination port not specified\n"
-@@ -208,15 +215,19 @@
- 		addattr_l(n, 1024, IFLA_VXLAN_GROUP, &gaddr, 4);
- 	else if (daddr)
- 		addattr_l(n, 1024, IFLA_VXLAN_GROUP, &daddr, 4);
-+#ifndef NO_IPV6
- 	if (memcmp(&gaddr6, &in6addr_any, sizeof(gaddr6)) != 0)
- 		addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &gaddr6, sizeof(struct in6_addr));
- 	else if (memcmp(&daddr6, &in6addr_any, sizeof(daddr6)) != 0)
- 		addattr_l(n, 1024, IFLA_VXLAN_GROUP6, &daddr6, sizeof(struct in6_addr));
-+#endif
- 
- 	if (saddr)
- 		addattr_l(n, 1024, IFLA_VXLAN_LOCAL, &saddr, 4);
-+#ifndef NO_IPV6
- 	else if (memcmp(&saddr6, &in6addr_any, sizeof(saddr6)) != 0)
- 		addattr_l(n, 1024, IFLA_VXLAN_LOCAL6, &saddr6, sizeof(struct in6_addr));
-+#endif
- 
- 	if (link)
- 		addattr32(n, 1024, IFLA_VXLAN_LINK, link);
-@@ -275,6 +286,7 @@
- 	} else if (tb[IFLA_VXLAN_GROUP6]) {
- 		struct in6_addr addr;
- 		memcpy(&addr, RTA_DATA(tb[IFLA_VXLAN_GROUP6]), sizeof(struct in6_addr));
-+#ifndef NO_IPV6
- 		if (memcmp(&addr, &in6addr_any, sizeof(addr)) != 0) {
- 			if (IN6_IS_ADDR_MULTICAST(&addr))
- 				fprintf(f, "group %s ",
-@@ -283,6 +295,7 @@
- 				fprintf(f, "remote %s ",
- 					format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));
- 		}
-+#endif
- 	}
- 
- 	if (tb[IFLA_VXLAN_LOCAL]) {
-@@ -293,9 +306,11 @@
- 	} else if (tb[IFLA_VXLAN_LOCAL6]) {
- 		struct in6_addr addr;
- 		memcpy(&addr, RTA_DATA(tb[IFLA_VXLAN_LOCAL6]), sizeof(struct in6_addr));
-+#ifndef NO_IPV6
- 		if (memcmp(&addr, &in6addr_any, sizeof(addr)) != 0)
- 			fprintf(f, "local %s ",
- 				format_host(AF_INET6, sizeof(struct in6_addr), &addr, s1, sizeof(s1)));
-+#endif
- 	}
- 
- 	if (tb[IFLA_VXLAN_LINK] &&
diff --git a/package/libeXosip2/0001-fix-non-ipv6-build.patch b/package/libeXosip2/0001-fix-non-ipv6-build.patch
deleted file mode 100644
index bec833f..0000000
--- a/package/libeXosip2/0001-fix-non-ipv6-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-[PATCH] Fix build on systems without IPV6_TCLASS support
-
-The wrong variable name was used.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/eXtl_udp.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: libeXosip2-3.6.0/src/eXtl_udp.c
-===================================================================
---- libeXosip2-3.6.0.orig/src/eXtl_udp.c
-+++ libeXosip2-3.6.0/src/eXtl_udp.c
-@@ -178,7 +178,7 @@
- 		res = setsockopt(udp_socket, IPPROTO_IPV6, IPV6_TCLASS,
- 			(SOCKET_OPTION_VALUE)&tos, sizeof(tos));
- #else
--		retval = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS,
-+		res = setsockopt(udp_socket, IPPROTO_IPV6, IP_TOS,
- 			(SOCKET_OPTION_VALUE)&tos, sizeof(tos));
- #endif
- 	}
diff --git a/package/libglib2/0001-optional-ipv6.patch b/package/libglib2/0001-optional-ipv6.patch
deleted file mode 100644
index cbab1f1..0000000
--- a/package/libglib2/0001-optional-ipv6.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-[PATCH]: fix build on uClibc without IPv6 support
-
-Updated to glib 2.36 by Thomas Petazzoni.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- gio/ginetaddress.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
-Index: b/gio/ginetaddress.c
-===================================================================
---- a/gio/ginetaddress.c
-+++ b/gio/ginetaddress.c
-@@ -21,6 +21,7 @@
-  *          Samuel Cormier-Iijima <sciyoshi@gmail.com>
-  */
- 
-+#include <features.h>
- #include <config.h>
- 
- #include <string.h>
-@@ -423,7 +424,11 @@
-   return NULL;
- }
- 
-+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
-+#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET)
-+#else
- #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6)
-+#endif
- 
- /**
-  * g_inet_address_new_from_bytes:
-@@ -472,8 +477,10 @@
- 
-       return g_inet_address_new_from_bytes (addr, family);
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else
-     return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family);
-+#endif
- }
- 
- /**
-@@ -499,8 +506,10 @@
- 
-       return g_inet_address_new_from_bytes (addr, family);
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else
-     return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family);
-+#endif
- }
- 
- 
-Index: b/gio/gsocket.c
-===================================================================
---- a/gio/gsocket.c
-+++ b/gio/gsocket.c
-@@ -425,7 +425,9 @@
-   switch (family)
-     {
-      case G_SOCKET_FAMILY_IPV4:
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-      case G_SOCKET_FAMILY_IPV6:
-+#endif
-        socket->priv->family = address.ss_family;
-        switch (socket->priv->type)
- 	 {
-@@ -1321,11 +1323,13 @@
-       g_socket_get_option (socket, IPPROTO_IP, IP_TTL,
- 			   &value, &error);
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
-     {
-       g_socket_get_option (socket, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
- 			   &value, &error);
-     }
-+#endif
-   else
-     g_return_val_if_reached (0);
- 
-@@ -1362,6 +1366,7 @@
-       g_socket_set_option (socket, IPPROTO_IP, IP_TTL,
- 			   ttl, &error);
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
-     {
-       g_socket_set_option (socket, IPPROTO_IP, IP_TTL,
-@@ -1369,6 +1374,7 @@
-       g_socket_set_option (socket, IPPROTO_IPV6, IPV6_UNICAST_HOPS,
- 			   ttl, &error);
-     }
-+#endif
-   else
-     g_return_if_reached ();
- 
-@@ -1470,11 +1476,13 @@
-       g_socket_get_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP,
- 			   &value, &error);
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
-     {
-       g_socket_get_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
- 			   &value, &error);
-     }
-+#endif
-   else
-     g_return_val_if_reached (FALSE);
- 
-@@ -1515,6 +1523,7 @@
-       g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP,
- 			   loopback, &error);
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
-     {
-       g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_LOOP,
-@@ -1522,6 +1531,7 @@
-       g_socket_set_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_LOOP,
- 			   loopback, &error);
-     }
-+#endif
-   else
-     g_return_if_reached ();
- 
-@@ -1559,11 +1569,13 @@
-       g_socket_get_option (socket, IPPROTO_IP, IP_MULTICAST_TTL,
- 			   &value, &error);
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
-     {
-       g_socket_get_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
- 			   &value, &error);
-     }
-+#endif
-   else
-     g_return_val_if_reached (FALSE);
- 
-@@ -1601,6 +1613,7 @@
-       g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_TTL,
- 			   ttl, &error);
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else if (socket->priv->family == G_SOCKET_FAMILY_IPV6)
-     {
-       g_socket_set_option (socket, IPPROTO_IP, IP_MULTICAST_TTL,
-@@ -1608,6 +1621,7 @@
-       g_socket_set_option (socket, IPPROTO_IPV6, IPV6_MULTICAST_HOPS,
- 			   ttl, &error);
-     }
-+#endif
-   else
-     g_return_if_reached ();
- 
-@@ -1965,6 +1979,7 @@
-       result = setsockopt (socket->priv->fd, IPPROTO_IP, optname,
- 			   &mc_req, sizeof (mc_req));
-     }
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__))
-   else if (g_inet_address_get_family (group) == G_SOCKET_FAMILY_IPV6)
-     {
-       struct ipv6_mreq mc_req_ipv6;
-@@ -1982,6 +1997,7 @@
-       result = setsockopt (socket->priv->fd, IPPROTO_IPV6, optname,
- 			   &mc_req_ipv6, sizeof (mc_req_ipv6));
-     }
-+#endif
-   else
-     g_return_val_if_reached (FALSE);
- 
-@@ -2089,8 +2105,8 @@
-     case G_SOCKET_FAMILY_IPV4:
-       return TRUE;
- 
--    case G_SOCKET_FAMILY_IPV6:
- #if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY)
-+    case G_SOCKET_FAMILY_IPV6:
-       {
-         gint v6_only;
- 
-@@ -2101,8 +2117,6 @@
- 
-         return !v6_only;
-       }
--#else
--      return FALSE;
- #endif
- 
-     default:
diff --git a/package/libnice/0001-build-IPV6_RECVERR.patch b/package/libnice/0001-build-IPV6_RECVERR.patch
deleted file mode 100644
index af55bb9..0000000
--- a/package/libnice/0001-build-IPV6_RECVERR.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Make libnice build in non-IPv6 configurations
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: b/stun/usages/bind.c
-===================================================================
---- a/stun/usages/bind.c
-+++ b/stun/usages/bind.c
-@@ -260,9 +260,11 @@
-       case AF_INET:
-         setsockopt (fd, SOL_IP, IP_RECVERR, &yes, sizeof (yes));
-         break;
-+#ifdef IPV6_RECVERR
-       case AF_INET6:
-         setsockopt (fd, SOL_IPV6, IPV6_RECVERR, &yes, sizeof (yes));
-         break;
-+#endif
-       default:
-         /* Nothing to do. */
-         break;
diff --git a/package/libtirpc/0003-Make-IPv6-support-optional.patch b/package/libtirpc/0003-Make-IPv6-support-optional.patch
deleted file mode 100644
index ad8ce65..0000000
--- a/package/libtirpc/0003-Make-IPv6-support-optional.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From fbe5fccf0e3bdaae3defc66a288176797fd12a17 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sun, 24 Jun 2012 21:40:21 +0200
-Subject: [PATCH] Make IPv6 support optional
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- src/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index b5db263..f086255 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -7,7 +7,7 @@
- 
- noinst_HEADERS = rpc_com.h
- 
--AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP -DINET6 \
-+AM_CPPFLAGS = -I$(top_srcdir)/tirpc -DPORTMAP \
- 		-D_GNU_SOURCE -Wall -pipe  
- 
- lib_LTLIBRARIES = libtirpc.la
--- 
-2.0.0
-
diff --git a/package/luasocket/0001-uClibc-IPv6.patch b/package/luasocket/0001-uClibc-IPv6.patch
deleted file mode 100644
index ae70b4d..0000000
--- a/package/luasocket/0001-uClibc-IPv6.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-fix build with uClibc without IPv6 support
-
-see Pull Request: https://github.com/diegonehab/luasocket/pull/90
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/luasocket-3.0-rc1/src/options.c
-===================================================================
---- a/luasocket-3.0-rc1/src/options.c
-+++ b/luasocket-3.0-rc1/src/options.c
-@@ -110,6 +110,7 @@
-     return opt_setboolean(L, ps, SOL_SOCKET, SO_BROADCAST);
- }
- 
-+#ifdef IPV6_UNICAST_HOPS
- int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps)
- {
-   return opt_setint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS);
-@@ -119,7 +120,9 @@
- {
-   return opt_getint(L, ps, IPPROTO_IPV6, IPV6_UNICAST_HOPS);
- }
-+#endif
- 
-+#ifdef IPV6_MULTICAST_HOPS
- int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps)
- {
-   return opt_setint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS);
-@@ -129,6 +132,7 @@
- {
-   return opt_getint(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_HOPS);
- }
-+#endif
- 
- int opt_set_ip_multicast_loop(lua_State *L, p_socket ps)
- {
-@@ -140,6 +144,7 @@
-     return opt_getboolean(L, ps, IPPROTO_IP, IP_MULTICAST_LOOP);
- }
- 
-+#ifdef IPV6_MULTICAST_LOOP
- int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps)
- {
-     return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP);
-@@ -149,6 +154,7 @@
- {
-     return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_MULTICAST_LOOP);
- }
-+#endif
- 
- int opt_set_linger(lua_State *L, p_socket ps)
- {
-@@ -221,16 +227,21 @@
-     return opt_setmembership(L, ps, IPPROTO_IP, IP_DROP_MEMBERSHIP);
- }
- 
-+#ifdef IPV6_ADD_MEMBERSHIP
- int opt_set_ip6_add_membership(lua_State *L, p_socket ps)
- {
-     return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP);
- }
-+#endif
- 
-+#ifdef IPV6_DROP_MEMBERSHIP
- int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps)
- {
-     return opt_ip6_setmembership(L, ps, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP);
- }
-+#endif
- 
-+#ifdef IPV6_V6ONLY
- int opt_get_ip6_v6only(lua_State *L, p_socket ps)
- {
-     return opt_getboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY);
-@@ -240,6 +251,7 @@
- {
-     return opt_setboolean(L, ps, IPPROTO_IPV6, IPV6_V6ONLY);
- }
-+#endif
- 
- /*=========================================================================*\
- * Auxiliar functions
-Index: b/luasocket-3.0-rc1/src/options.h
-===================================================================
---- a/luasocket-3.0-rc1/src/options.h
-+++ b/luasocket-3.0-rc1/src/options.h
-@@ -32,12 +32,24 @@
- int opt_set_ip_multicast_loop(lua_State *L, p_socket ps);
- int opt_set_ip_add_membership(lua_State *L, p_socket ps);
- int opt_set_ip_drop_membersip(lua_State *L, p_socket ps);
-+#ifdef IPV6_UNICAST_HOPS
- int opt_set_ip6_unicast_hops(lua_State *L, p_socket ps);
-+#endif
-+#ifdef IPV6_MULTICAST_HOPS
- int opt_set_ip6_multicast_hops(lua_State *L, p_socket ps);
-+#endif
-+#ifdef IPV6_MULTICAST_LOOP
- int opt_set_ip6_multicast_loop(lua_State *L, p_socket ps);
-+#endif
-+#ifdef IPV6_ADD_MEMBERSHIP
- int opt_set_ip6_add_membership(lua_State *L, p_socket ps);
-+#endif
-+#ifdef IPV6_DROP_MEMBERSHIP
- int opt_set_ip6_drop_membersip(lua_State *L, p_socket ps);
-+#endif
-+#ifdef IPV6_V6ONLY
- int opt_set_ip6_v6only(lua_State *L, p_socket ps);
-+#endif
- 
- /* supported options for getoption */
- int opt_get_reuseaddr(lua_State *L, p_socket ps);
-@@ -48,10 +60,18 @@
- int opt_get_ip_multicast_loop(lua_State *L, p_socket ps);
- int opt_get_ip_multicast_if(lua_State *L, p_socket ps);
- int opt_get_error(lua_State *L, p_socket ps);
-+#ifdef IPV6_MULTICAST_LOOP
- int opt_get_ip6_multicast_loop(lua_State *L, p_socket ps);
-+#endif
-+#ifdef IPV6_MULTICAST_HOPS
- int opt_get_ip6_multicast_hops(lua_State *L, p_socket ps);
-+#endif
-+#ifdef IPV6_UNICAST_HOPS
- int opt_get_ip6_unicast_hops(lua_State *L, p_socket ps);
-+#endif
-+#ifdef IPV6_V6ONLY
- int opt_get_ip6_v6only(lua_State *L, p_socket ps); 
-+#endif
- 
- /* invokes the appropriate option handler */
- int opt_meth_setoption(lua_State *L, p_opt opt, p_socket ps);
-Index: b/luasocket-3.0-rc1/src/tcp.c
-===================================================================
---- a/luasocket-3.0-rc1/src/tcp.c
-+++ b/luasocket-3.0-rc1/src/tcp.c
-@@ -81,7 +81,9 @@
-     {"keepalive",   opt_set_keepalive},
-     {"reuseaddr",   opt_set_reuseaddr},
-     {"tcp-nodelay", opt_set_tcp_nodelay},
-+#ifdef IPV6_V6ONLY
-     {"ipv6-v6only", opt_set_ip6_v6only},
-+#endif
-     {"linger",      opt_set_linger},
-     {NULL,          NULL}
- };
-@@ -366,11 +368,13 @@
-         auxiliar_setclass(L, "tcp{master}", -1);
-         /* initialize remaining structure fields */
-         socket_setnonblocking(&sock);
-+#ifdef IPV6_V6ONLY
-         if (family == PF_INET6) {
-             int yes = 1;
-             setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 (void *)&yes, sizeof(yes));
-         }
-+#endif
-         tcp->sock = sock;
-         io_init(&tcp->io, (p_send) socket_send, (p_recv) socket_recv,
-                 (p_error) socket_ioerror, &tcp->sock);
-Index: b/luasocket-3.0-rc1/src/udp.c
-===================================================================
---- a/luasocket-3.0-rc1/src/udp.c
-+++ b/luasocket-3.0-rc1/src/udp.c
-@@ -78,12 +78,22 @@
-     {"ip-multicast-loop",    opt_set_ip_multicast_loop},
-     {"ip-add-membership",    opt_set_ip_add_membership},
-     {"ip-drop-membership",   opt_set_ip_drop_membersip},
-+#ifdef IPV6_UNICAST_HOPS
-     {"ipv6-unicast-hops",    opt_set_ip6_unicast_hops},
-     {"ipv6-multicast-hops",  opt_set_ip6_unicast_hops},
-+#endif
-+#ifdef IPV6_MULTICAST_LOOP
-     {"ipv6-multicast-loop",  opt_set_ip6_multicast_loop},
-+#endif
-+#ifdef IPV6_ADD_MEMBERSHIP
-     {"ipv6-add-membership",  opt_set_ip6_add_membership},
-+#endif
-+#ifdef IPV6_DROP_MEMBERSHIP
-     {"ipv6-drop-membership", opt_set_ip6_drop_membersip},
-+#endif
-+#ifdef IPV6_V6ONLY
-     {"ipv6-v6only",          opt_set_ip6_v6only},
-+#endif
-     {NULL,                   NULL}
- };
- 
-@@ -92,10 +102,16 @@
-     {"ip-multicast-if",      opt_get_ip_multicast_if},
-     {"ip-multicast-loop",    opt_get_ip_multicast_loop},
-     {"error",                opt_get_error},
-+#ifdef IPV6_UNICAST_HOPS
-     {"ipv6-unicast-hops",    opt_get_ip6_unicast_hops},
-     {"ipv6-multicast-hops",  opt_get_ip6_unicast_hops},
-+#endif
-+#ifdef IPV6_MULTICAST_LOOP
-     {"ipv6-multicast-loop",  opt_get_ip6_multicast_loop},
-+#endif
-+#ifdef IPV6_V6ONLY
-     {"ipv6-v6only",          opt_get_ip6_v6only},
-+#endif
-     {NULL,                   NULL}
- };
- 
-@@ -416,11 +432,13 @@
-         auxiliar_setclass(L, "udp{unconnected}", -1);
-         /* initialize remaining structure fields */
-         socket_setnonblocking(&sock);
-+#ifdef IPV6_V6ONLY
-         if (family == PF_INET6) {
-             int yes = 1;
-             setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
-                 (void *)&yes, sizeof(yes));
-         }
-+#endif
-         udp->sock = sock;
-         timeout_init(&udp->tm, -1, -1);
-         udp->family = family;
-
diff --git a/package/perl/0001-uClibc-IPv6.patch b/package/perl/0001-uClibc-IPv6.patch
deleted file mode 100644
index b29d373..0000000
--- a/package/perl/0001-uClibc-IPv6.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-fix on uClibc without IPv6 support
-
-Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
-
-Index: b/cpan/Socket/Socket.xs
-===================================================================
---- a/cpan/Socket/Socket.xs
-+++ b/cpan/Socket/Socket.xs
-@@ -920,7 +920,7 @@
- 	CODE:
- #ifdef HAS_INETNTOP
- 	STRLEN addrlen;
--#ifdef AF_INET6
-+#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
- 	struct in6_addr addr;
- 	char str[INET6_ADDRSTRLEN];
- #else
-@@ -940,7 +940,7 @@
- 		croak("Bad address length for Socket::inet_ntop on AF_INET;"
- 		      " got %"UVuf", should be 4", (UV)addrlen);
- 	    break;
--#ifdef AF_INET6
-+#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
- 	  case AF_INET6:
- 	    if(addrlen != 16)
- 		croak("Bad address length for Socket::inet_ntop on AF_INET6;"
-@@ -949,7 +949,7 @@
- #endif
- 	  default:
- 		croak("Bad address family for %s, got %d, should be"
--#ifdef AF_INET6
-+#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
- 		      " either AF_INET or AF_INET6",
- #else
- 		      " AF_INET",
-@@ -979,7 +979,7 @@
- #ifdef HAS_INETPTON
- 	int ok;
- 	int addrlen = 0;
--#ifdef AF_INET6
-+#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
- 	struct in6_addr ip_address;
- #else
- 	struct in_addr ip_address;
-@@ -989,14 +989,14 @@
- 	  case AF_INET:
- 	    addrlen = 4;
- 	    break;
--#ifdef AF_INET6
-+#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
- 	  case AF_INET6:
- 	    addrlen = 16;
- 	    break;
- #endif
- 	  default:
- 		croak("Bad address family for %s, got %d, should be"
--#ifdef AF_INET6
-+#if (defined(__UCLIBC__) && defined(__UCLIBC_HAS_IPV6__)) || (!defined(__UCLIBC__) && defined(AF_INET6))
- 		      " either AF_INET or AF_INET6",
- #else
- 		      " AF_INET",
diff --git a/package/rpcbind/0003-Make-IPv6-configurable.patch b/package/rpcbind/0003-Make-IPv6-configurable.patch
deleted file mode 100644
index 0bb311c..0000000
--- a/package/rpcbind/0003-Make-IPv6-configurable.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5a1826d116ae986cb464d3503e0ae9ceaba3a687 Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 10 Nov 2012 22:24:56 +0100
-Subject: [PATCH] Make IPv6 configurable
-
-Add an autoconf check that verifies whether IPv6 is available or not,
-and define the INET6 macro if available, instead of hardcoding it in
-src/Makefile.am.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile.am  | 1 -
- configure.in | 3 +++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index d10c906..c983a3e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -3,7 +3,6 @@ AM_CPPFLAGS = \
- 	-DPORTMAP \
- 	-DFACILITY=LOG_MAIL \
- 	-DSEVERITY=LOG_INFO \
--	-DINET6 \
- 	-DRPCBIND_STATEDIR="\"$(statedir)\"" \
- 	-DRPCBIND_USER="\"$(rpcuser)\"" \
- 	-D_GNU_SOURCE \
-diff --git a/configure.ac b/configure.ac
-index 2b67720..f144c8e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -36,4 +36,7 @@ AS_IF([test x$enable_libwrap = xyes], [
- 
- AC_SEARCH_LIBS([pthread_create], [pthread])
- 
-+AC_CHECK_HEADER(netinet/ip6.h,
-+        AC_DEFINE(INET6, 1, [Define to 1 if IPv6 is available]))
-+
- AC_OUTPUT([Makefile])
--- 
-2.0.0
-
diff --git a/package/rpcbind/rpcbind.mk b/package/rpcbind/rpcbind.mk
index 55de3fc..7bfb1e2 100644
--- a/package/rpcbind/rpcbind.mk
+++ b/package/rpcbind/rpcbind.mk
@@ -9,7 +9,6 @@ RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIN
 RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2
 RPCBIND_LICENSE = BSD-3c
 RPCBIND_LICENSE_FILES = COPYING
-RPCBIND_AUTORECONF = YES
 
 RPCBIND_CONF_ENV += \
 	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/"
diff --git a/package/x11vnc/0001-ipv6.patch b/package/x11vnc/0001-ipv6.patch
deleted file mode 100644
index 89c2835..0000000
--- a/package/x11vnc/0001-ipv6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-[PATCH] fix build on uClibc without IPv6 support
-
-Some systems (like uClibc) defines AF_INET6 even when configured without
-IPv6 support, so don't use that to decide if IPv6 support should be enabled.
-
-Instead use the X11VNC_IPV6 define like elsewhere in the code.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- x11vnc/enc.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: x11vnc-0.9.13/x11vnc/enc.h
-===================================================================
---- x11vnc-0.9.13.orig/x11vnc/enc.h
-+++ x11vnc-0.9.13/x11vnc/enc.h
-@@ -1733,7 +1733,7 @@
- 	}
- 
- 	try6:
--#ifdef AF_INET6
-+#if X11VNC_IPV6
- 	if (!getenv("ULTRAVNC_DSM_HELPER_NOIPV6")) {
- 		struct sockaddr_in6 sin;
- 		int one = 1, sock = -1;
-- 
2.0.5

[Buildroot] [PATCH 11/14] packages: remove non-IPv6 enabler patches

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> These are no longer required so remove them.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
>  package/avahi/0003-ipv6only.patch                  |  19 --
>  package/avahi/0005-optional-ipv6.patch             | 147 --------------
>  package/iproute2/0001-optional-ipv6.patch          |  89 ---------
>  package/iproute2/0002-vxlan-optional-ipv6.patch    |  83 --------
>  package/libeXosip2/0001-fix-non-ipv6-build.patch   |  22 ---
>  package/libglib2/0001-optional-ipv6.patch          | 195 ------------------
>  package/libnice/0001-build-IPV6_RECVERR.patch      |  20 --
>  .../libtirpc/0003-Make-IPv6-support-optional.patch |  26 ---
>  package/luasocket/0001-uClibc-IPv6.patch           | 217 ---------------------
>  package/perl/0001-uClibc-IPv6.patch                |  61 ------
>  package/rpcbind/0003-Make-IPv6-configurable.patch  |  42 ----
>  package/rpcbind/rpcbind.mk                         |   1 -
>  package/x11vnc/0001-ipv6.patch                     |  25 ---
>  13 files changed, 947 deletions(-)
>  delete mode 100644 package/avahi/0003-ipv6only.patch
>  delete mode 100644 package/avahi/0005-optional-ipv6.patch
>  delete mode 100644 package/iproute2/0001-optional-ipv6.patch
>  delete mode 100644 package/iproute2/0002-vxlan-optional-ipv6.patch
>  delete mode 100644 package/libeXosip2/0001-fix-non-ipv6-build.patch
>  delete mode 100644 package/libglib2/0001-optional-ipv6.patch
>  delete mode 100644 package/libnice/0001-build-IPV6_RECVERR.patch
>  delete mode 100644 package/libtirpc/0003-Make-IPv6-support-optional.patch
>  delete mode 100644 package/luasocket/0001-uClibc-IPv6.patch
>  delete mode 100644 package/perl/0001-uClibc-IPv6.patch
>  delete mode 100644 package/rpcbind/0003-Make-IPv6-configurable.patch
>  delete mode 100644 package/x11vnc/0001-ipv6.patch

We also have one patch dealing with IPv6 for lighttpd:

  - package/lighttpd/0001-Fix-default-config-file.patch

    @@ -90,7 +90,7 @@ server.port = 80
     ##
     ## Use IPv6?
     ##
    -server.use-ipv6 = "enable"
    +# server.use-ipv6 = "enable"
     
     ##
     ## bind to a specific IP

  - changes the default config to disable IPv6: do we want to keep that
    hunk?

Otherwise:

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 11/14] packages: remove non-IPv6 enabler patches

[Gustavo Zacarias]

On 04/12/2015 11:55 AM, Yann E. MORIN wrote:
> We also have one patch dealing with IPv6 for lighttpd:
> 
>   - package/lighttpd/0001-Fix-default-config-file.patch
> 
>     @@ -90,7 +90,7 @@ server.port = 80
>      ##
>      ## Use IPv6?
>      ##
>     -server.use-ipv6 = "enable"
>     +# server.use-ipv6 = "enable"
>      
>      ##
>      ## bind to a specific IP
> 
>   - changes the default config to disable IPv6: do we want to keep that
>     hunk?
> 
> Otherwise:
> 
> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

For this one i'm unsure how lighttpd will react to enabling ipv6 on a
non-ipv6 kernel, so i'll leave it as is.
Regards.

[Buildroot] [PATCH 12/14] packages: remove non-IPv6 dependencies and tweaks

[Gustavo Zacarias]

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

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/aiccu/Config.in                      |  5 ++---
 package/argus/Config.in                      |  5 ++---
 package/atftp/Config.in                      |  5 ++---
 package/batctl/Config.in                     |  5 ++---
 package/bind/Config.in                       |  5 ++---
 package/bluez5_utils/Config.in               |  6 ++----
 package/chrony/chrony.mk                     |  4 ----
 package/civetweb/civetweb.mk                 |  6 +-----
 package/classpath/Config.in                  |  5 -----
 package/collectd/Config.in                   |  7 ++-----
 package/connman/Config.in                    |  5 ++---
 package/conntrack-tools/Config.in            |  6 ++----
 package/cppzmq/Config.in                     |  7 +++----
 package/czmq/Config.in                       |  7 +++----
 package/dhcp/dhcp.mk                         |  4 ----
 package/dhcpcd/dhcpcd.mk                     |  4 ----
 package/dnsmasq/dnsmasq.mk                   |  4 ----
 package/dovecot/Config.in                    |  5 -----
 package/ebtables/Config.in                   |  5 -----
 package/ffmpeg/Config.in                     |  6 ------
 package/filemq/Config.in                     |  7 +++----
 package/gnuradio/Config.in                   |  6 ++----
 package/gnutls/gnutls.mk                     |  2 +-
 package/gpsd/gpsd.mk                         |  5 -----
 package/gstreamer/gst-ffmpeg/Config.in       |  4 ----
 package/gstreamer/gst-plugins-good/Config.in |  4 ----
 package/hiawatha/hiawatha.mk                 |  1 -
 package/hostapd/hostapd.mk                   |  4 ----
 package/iftop/Config.in                      |  5 ++---
 package/iptables/iptables.mk                 |  8 --------
 package/iptraf-ng/Config.in                  |  5 -----
 package/iputils/Config.in                    |  2 +-
 package/iputils/iputils.mk                   | 20 ++++++--------------
 package/jamvm/Config.in                      |  4 +---
 package/kodi/Config.in                       |  5 ++---
 package/libiio/libiio.mk                     |  2 +-
 package/libndp/Config.in                     |  4 ----
 package/libnetfilter_queue/Config.in         |  4 ----
 package/libnftnl/Config.in                   |  4 ----
 package/libnspr/libnspr.mk                   |  2 +-
 package/liboping/Config.in                   |  4 ----
 package/libshairplay/Config.in               |  5 ++---
 package/libsoup/libsoup.mk                   |  7 -------
 package/libuv/Config.in                      |  5 ++---
 package/libvncserver/libvncserver.mk         |  4 ----
 package/libwebsockets/libwebsockets.mk       |  9 +--------
 package/linphone/Config.in                   |  6 ++----
 package/lsof/lsof.mk                         |  9 ++-------
 package/ltp-testsuite/Config.in              |  6 ++----
 package/lxc/Config.in                        |  5 ++---
 package/mediastreamer/Config.in              |  6 ++----
 package/minidlna/Config.in                   |  5 ++---
 package/modem-manager/Config.in              |  7 +++----
 package/mongrel2/Config.in                   |  5 ++---
 package/mono/Config.in                       |  5 ++---
 package/mpd/Config.in                        |  4 ----
 package/mplayer/mplayer.mk                   | 14 +-------------
 package/mtd/Config.in                        |  4 ----
 package/ndisc6/Config.in                     |  5 -----
 package/net-tools/net-tools.mk               |  4 +---
 package/netsnmp/netsnmp.mk                   | 11 +----------
 package/network-manager/Config.in            |  6 ++----
 package/nftables/Config.in                   |  6 ++----
 package/nginx/nginx.mk                       |  6 +++---
 package/nmap/Config.in                       |  5 ++---
 package/nodejs/Config.in                     |  6 ++----
 package/ntp/ntp.mk                           |  4 ----
 package/odhcp6c/Config.in                    |  5 -----
 package/olsr/Config.in                       |  5 ++---
 package/opencv/Config.in                     |  4 ----
 package/openntpd/Config.in                   |  5 ++---
 package/openobex/Config.in                   |  4 ----
 package/openpgm/Config.in                    |  5 ++---
 package/openvmtools/Config.in                |  5 ++---
 package/openvpn/Config.in                    |  5 -----
 package/php-zmq/Config.in                    |  7 +++----
 package/php/php.mk                           |  7 -------
 package/postgresql/postgresql.mk             |  8 +-------
 package/pppd/pppd.mk                         |  5 +----
 package/proftpd/proftpd.mk                   |  3 +--
 package/python-pyzmq/Config.in               |  7 +++----
 package/qemu/Config.in                       |  5 ++---
 package/qt/qt.mk                             |  7 -------
 package/qt5/Config.in                        |  5 ++---
 package/quagga/Config.in                     |  5 -----
 package/radvd/Config.in                      |  5 -----
 package/redis/Config.in                      |  5 ++---
 package/samba/samba.mk                       |  2 +-
 package/sconeserver/sconeserver.mk           |  8 +-------
 package/ser2net/Config.in                    |  5 -----
 package/smcroute/Config.in                   |  5 -----
 package/spawn-fcgi/spawn-fcgi.mk             |  4 ----
 package/squid/Config.in                      |  6 ++----
 package/strongswan/Config.in                 |  3 ---
 package/strongswan/strongswan.mk             |  4 ++--
 package/systemd/Config.in                    |  1 -
 package/tcl/Config.in                        |  6 ++----
 package/tftpd/tftpd.mk                       |  4 ----
 package/tovid/Config.in                      |  5 ++---
 package/transmission/Config.in               |  5 ++---
 package/trinity/trinity.mk                   |  4 ----
 package/tvheadend/Config.in                  |  5 ++---
 package/ulogd/Config.in                      |  5 ++---
 package/ussp-push/Config.in                  |  5 ++---
 package/x11vnc/x11vnc.mk                     |  6 ------
 package/zeromq/Config.in                     |  7 +++----
 package/zmqpp/Config.in                      |  7 +++----
 package/zyre/Config.in                       |  7 +++----
 108 files changed, 133 insertions(+), 445 deletions(-)

diff --git a/package/aiccu/Config.in b/package/aiccu/Config.in
index bd67bac..4a0d20d 100644
--- 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 6d47734..7a7d2b6 100644
--- 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 2a3df76..7074716 100644
--- 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 a60f4f6..2557418 100644
--- 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 95bbab1..d758884 100644
--- 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 8841649..0131822 100644
--- 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 de80b52..8e41ddc 100644
--- 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 c688f0d..048c91f 100644
--- 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 a11845c..ce71160 100644
--- 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 98eb51e..ba290c3 100644
--- 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 39a8ed4..a887c2f 100644
--- 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 a928352..84d3fd4 100644
--- 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 d064901..788fd0b 100644
--- 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 66c0437..6a99336 100644
--- 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 e6465ed..c0d4588 100644
--- 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 6f82090..7e30422 100644
--- 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 3b05590..4b0999b 100644
--- 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 fedc4d9..5fd1714 100644
--- 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 3a678ad..18fff24 100644
--- 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 bfdc624..00163ba 100644
--- 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 4015b92..4460f87 100644
--- 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 a33deeb..752a50b 100644
--- 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 47c07f9..b99cacb 100644
--- 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 9623d75..1bf4415 100644
--- 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 fc2906f..c89070f 100644
--- 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 6fb1a84..70ae9c1 100644
--- 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 76619e0..91c972d 100644
--- 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 a933d79..1ad32a2 100644
--- 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 eb40a30..8c6ae0c 100644
--- 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 38faa68..e425ec6 100644
--- 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 64e19d2..5574cfa 100644
--- 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 fdddb52..5324639 100644
--- 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 735ed65..92c6873 100644
--- 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,6 +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
+	$(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
 	$(IPUTILS_IPV6_INSTALL_TARGET_CMDS)
 endef
 
diff --git a/package/jamvm/Config.in b/package/jamvm/Config.in
index 375bded..3b5ff3e 100644
--- 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 91c1cce..254a1df 100644
--- 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 7082e89..9b63e12 100644
--- 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 bb9093b..6639bb5 100644
--- 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 767f44a..e93e8ea 100644
--- 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 0d3db5b..dcbfde0 100644
--- 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 91a740a..8c14c0b 100644
--- a/package/libnspr/libnspr.mk
+++ b/package/libnspr/libnspr.mk
@@ -20,7 +20,7 @@ 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
+LIBNSPR_CONF_OPTS += --enable-ipv6
 
 ifeq ($(BR2_STATIC_LIBS),y)
 LIBNSPR_MAKE_OPTS = SHARED_LIBRARY=
diff --git a/package/liboping/Config.in b/package/liboping/Config.in
index 65e7c88..1d2de31 100644
--- 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 0895cd2..1cfbdfe 100644
--- 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 70f1074..8cbd0cb 100644
--- 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 f6d7e5f..66cd3f2 100644
--- 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 87bcf45..92cb1e1 100644
--- 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 da1a872..9e62f1c 100644
--- 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 72eca7d..6d6ffae 100644
--- 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 5d1f564..19b303b 100644
--- 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 4929bbc..52c02ce 100644
--- 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 dc287c1..10a668d 100644
--- 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 ebcb647..396f7e4 100644
--- 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 c78f1b6..0eef751 100644
--- 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 1c565ee..59b8d88 100644
--- 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 77ca921..1afba77 100644
--- 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 cc015e6..1db5df4 100644
--- 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 8ed1149..5e19297 100644
--- 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 55cf421..3a61b8f 100644
--- 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 bef5178..6653464 100644
--- 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 0fad92a..321bfbc 100644
--- 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 ee69648..ab0dd7c 100644
--- 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 f747011..6eff5e3 100644
--- 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 e68a4dd..cc8f616 100644
--- 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 9779ae9..9b20b90 100644
--- 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 be9bd0a..90ebbcc 100644
--- 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 2364dac..79f587a 100644
--- 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 5f1346c..d044c8e 100644
--- 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 c91cc70..554094d 100644
--- 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 9e5f3ef..329b55c 100644
--- 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 707191a..70e5a48 100644
--- 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 b1cab9c..e40437f 100644
--- 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 192576f..1433b09 100644
--- 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 c56692d..5f606fe 100644
--- 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 8d03c84..cef5ed4 100644
--- 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 bcc9ad0..ebad876 100644
--- 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 26b6b98..5edb479 100644
--- 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 37322a2..c258272 100644
--- 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/php.mk b/package/php/php.mk
index 1a5e084..f91f076 100644
--- 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 006e79b..85ac0e6 100644
--- 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 31d6e06..e143321 100644
--- a/package/pppd/pppd.mk
+++ b/package/pppd/pppd.mk
@@ -7,6 +7,7 @@
 PPPD_VERSION = 2.4.7
 PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz
 PPPD_SITE = ftp://ftp.samba.org/pub/ppp
+PPPD_MAKE_OPTS = HAVE_INET6=y
 PPPD_LICENSE = LGPLv2+ LGPL BSD-4c BSD-3c GPLv2+
 PPPD_LICENSE_FILES = \
 	pppd/tdb.c pppd/plugins/pppoatm/COPYING \
@@ -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 575c381..023b4dd 100644
--- 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 c521706..af4467f 100644
--- 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 65421c0..fff786d 100644
--- 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 76acbfc..d1615ae 100644
--- 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 9d316b1..e8ec7d9 100644
--- 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 4a9f8bb..89ff6f2 100644
--- 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 c04a8e5..48aeedc 100644
--- 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 695bd91..3b7b743 100644
--- 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 f4f07ac..68da9d9 100644
--- 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 d619ad1..3ff891b 100644
--- 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 552ab0f..3f0d15b 100644
--- 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 c244cb9..f9a81f6 100755
--- 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/spawn-fcgi/spawn-fcgi.mk b/package/spawn-fcgi/spawn-fcgi.mk
index aac2f9e..13357bb 100644
--- 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 a9300d8..0ab6b37 100644
--- 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 bdbbb50..dbf07c5 100644
--- a/package/strongswan/Config.in
+++ b/package/strongswan/Config.in
@@ -24,9 +24,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 057870f..af21dda 100644
--- 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/systemd/Config.in b/package/systemd/Config.in
index d00ac9d..38353d0 100644
--- a/package/systemd/Config.in
+++ b/package/systemd/Config.in
@@ -11,7 +11,6 @@ config BR2_PACKAGE_SYSTEMD
 	bool "systemd"
 	depends on BR2_INIT_SYSTEMD
 	depends on BR2_USE_WCHAR # util-linux
-	depends on BR2_INET_IPV6
 	depends on !BR2_STATIC_LIBS # kmod
 	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
 	depends on BR2_USE_MMU # dbus
diff --git a/package/tcl/Config.in b/package/tcl/Config.in
index 11d46d3..63d1b25 100644
--- 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 778d45f..78df835 100644
--- 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 11c8085..ccf031e 100644
--- 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 5d37309..b47c36f 100644
--- 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 ecd82f8..211f1b6 100644
--- 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 27138ec..4edf014 100644
--- 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 7092409..bcd7d0d 100644
--- 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 c3f6b86..e6695bb 100644
--- 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 57d6f8d..cdb3237 100644
--- 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 d44af60..00fc048 100644
--- 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 d92a37a..f3d10c9 100644
--- 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 14075f0..95cbf95 100644
--- 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)
-- 
2.0.5

[Buildroot] [PATCH 12/14] packages: remove non-IPv6 dependencies and tweaks

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> Now that IPv6 is mandatory remove package dependencies and conditionals
> for it.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

You've missed an instance in package/php/Config.ext .

[--SNIP--]
> diff --git a/package/iputils/iputils.mk b/package/iputils/iputils.mk
> index 735ed65..92c6873 100644
> --- 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,6 +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
> +	$(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
>  	$(IPUTILS_IPV6_INSTALL_TARGET_CMDS)

IPUTILS_IPV6_INSTALL_TARGET_CMDS is now always undefined, you can ditch
it too.

[--SNIP--]
> diff --git a/package/libnspr/libnspr.mk b/package/libnspr/libnspr.mk
> index 91a740a..8c14c0b 100644
> --- a/package/libnspr/libnspr.mk
> +++ b/package/libnspr/libnspr.mk
> @@ -20,7 +20,7 @@ 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
> +LIBNSPR_CONF_OPTS += --enable-ipv6

libnspr is an autotools package, so this is passed in the standard
autocomf options. You can drop it from here.

[--SNIP--]
> diff --git a/package/netsnmp/netsnmp.mk b/package/netsnmp/netsnmp.mk
> index f747011..6eff5e3 100644
> --- 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 \

Ah, I see you removed it here. I still think it would be better to
remove it at the time you ditch DISABLE_IPV6.

[--SNIP--]
> diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
> index 575c381..023b4dd 100644
> --- 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;)

This is telling me that the nit about lighttpd I talked about in my
review of the previous patch, should be dropped.

[--SNIP--]
> diff --git a/package/systemd/Config.in b/package/systemd/Config.in
> index d00ac9d..38353d0 100644
> --- a/package/systemd/Config.in
> +++ b/package/systemd/Config.in
> @@ -11,7 +11,6 @@ config BR2_PACKAGE_SYSTEMD
>  	bool "systemd"
>  	depends on BR2_INIT_SYSTEMD
>  	depends on BR2_USE_WCHAR # util-linux
> -	depends on BR2_INET_IPV6

As I said previously, this should have been folded in your patch 9/14
(system: drop IPv6 depend for systemd).

[--SNIP--]

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 13/14] package/uclibc: drop BR2_TOOLCHAIN_BUILDROOT_INET_IPV6

[Gustavo Zacarias]

Kill the option to build the non-IPv6 variant and remove the hidden
option since it's now unused.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 package/uclibc/Config.in | 4 ----
 package/uclibc/uclibc.mk | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 5bd9098..4d464a6 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -86,10 +86,6 @@ config BR2_UCLIBC_CONFIG
 	  See also docs/README in this package.
 	  If unsure, use the default.
 
-config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
-	bool
-	default y
-
 config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
 	bool "Enable RPC support"
 	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
index 72a46d9..07ff8e5 100644
--- a/package/uclibc/uclibc.mk
+++ b/package/uclibc/uclibc.mk
@@ -212,11 +212,7 @@ endif
 # IPv6
 #
 
-ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),y)
 UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
-else
-UCLIBC_IPV6_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
-endif
 
 #
 # RPC
-- 
2.0.5

[Buildroot] [PATCH 13/14] package/uclibc: drop BR2_TOOLCHAIN_BUILDROOT_INET_IPV6

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> Kill the option to build the non-IPv6 variant and remove the hidden
> option since it's now unused.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  package/uclibc/Config.in | 4 ----
>  package/uclibc/uclibc.mk | 4 ----
>  2 files changed, 8 deletions(-)
> 
> diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
> index 5bd9098..4d464a6 100644
> --- a/package/uclibc/Config.in
> +++ b/package/uclibc/Config.in
> @@ -86,10 +86,6 @@ config BR2_UCLIBC_CONFIG
>  	  See also docs/README in this package.
>  	  If unsure, use the default.
>  
> -config BR2_TOOLCHAIN_BUILDROOT_INET_IPV6
> -	bool
> -	default y
> -
>  config BR2_TOOLCHAIN_BUILDROOT_INET_RPC
>  	bool "Enable RPC support"
>  	select BR2_TOOLCHAIN_HAS_NATIVE_RPC
> diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk
> index 72a46d9..07ff8e5 100644
> --- a/package/uclibc/uclibc.mk
> +++ b/package/uclibc/uclibc.mk
> @@ -212,11 +212,7 @@ endif
>  # IPv6
>  #
>  
> -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_IPV6),y)
>  UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
> -else
> -UCLIBC_IPV6_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config)
> -endif
>  
>  #
>  # RPC
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 14/14] toolchain-common: drop BR2_INET_IPV6

[Gustavo Zacarias]

It's now unused so farewell.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 toolchain/toolchain-common.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index dfb7394..478315b 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -5,10 +5,6 @@
 # so put it here instead
 source "package/gdb/Config.in.host"
 
-config BR2_INET_IPV6
-	bool
-	default y
-
 config BR2_TOOLCHAIN_HAS_GCC_BUG_58595
 	bool
 
-- 
2.0.5

[Buildroot] [PATCH 14/14] toolchain-common: drop BR2_INET_IPV6

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> It's now unused so farewell.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  toolchain/toolchain-common.in | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
> index dfb7394..478315b 100644
> --- a/toolchain/toolchain-common.in
> +++ b/toolchain/toolchain-common.in
> @@ -5,10 +5,6 @@
>  # so put it here instead
>  source "package/gdb/Config.in.host"
>  
> -config BR2_INET_IPV6
> -	bool
> -	default y
> -
>  config BR2_TOOLCHAIN_HAS_GCC_BUG_58595
>  	bool
>  
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH 01/14] toolchain/helpers: make IPv6 mandatory for uclibc toolchains

[Yann E. MORIN]

Gustavo, All,

On 2015-04-11 09:17 -0300, Gustavo Zacarias spake thusly:
> As previously discussed drop the non-IPv6 option for toolchains.
> The size delta is about 10 KiB and it just complicates package
> dependencies.
> 
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
>  toolchain/helpers.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk
> index 257fab2..cb3b61a 100644
> --- a/toolchain/helpers.mk
> +++ b/toolchain/helpers.mk
> @@ -284,7 +284,7 @@ check_uclibc = \
>  	UCLIBC_CONFIG_FILE=$${SYSROOT_DIR}/usr/include/bits/uClibc_config.h ; \
>  	$(call check_uclibc_feature,__ARCH_USE_MMU__,BR2_USE_MMU,$${UCLIBC_CONFIG_FILE},MMU support) ;\
>  	$(call check_uclibc_feature,__UCLIBC_HAS_LFS__,,$${UCLIBC_CONFIG_FILE},Large file support) ;\
> -	$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,BR2_INET_IPV6,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
> +	$(call check_uclibc_feature,__UCLIBC_HAS_IPV6__,,$${UCLIBC_CONFIG_FILE},IPv6 support) ;\
>  	$(call check_uclibc_feature,__UCLIBC_HAS_RPC__,BR2_TOOLCHAIN_HAS_NATIVE_RPC,$${UCLIBC_CONFIG_FILE},RPC support) ;\
>  	$(call check_uclibc_feature,__UCLIBC_HAS_LOCALE__,BR2_ENABLE_LOCALE,$${UCLIBC_CONFIG_FILE},Locale support) ;\
>  	$(call check_uclibc_feature,__UCLIBC_HAS_WCHAR__,BR2_USE_WCHAR,$${UCLIBC_CONFIG_FILE},Wide char support) ;\
> -- 
> 2.0.5
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'