domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "iptables: fix dependency for libip6tc on IPV6"

Browse Source 
This patch reverts commit 2dc1f54b12 as it
breaks the build for me on x86-64 if I've IPV6 support disabled. Same config
builds fine on `openwrt-18.06` branch at 55d078b2.

  $ grep IPV6 .config

  # CONFIG_KERNEL_IPV6 is not set
  # CONFIG_IPV6 is not set

Build errors out on:

  Package libiptc is missing dependencies for the following libraries:
  libip6tc.so.0

Looking at iptables-1.6.2/libiptc/Makefile.am:

  libiptc_la_LIBADD   = libip4tc.la libip6tc.la

and to iptables-1.6.2/libiptc/libiptc.pc.in:

  Requires:	libip4tc libip6tc

It seems that libiptc needs v4/v6 libs, so v6 isn't optional.

Cc: Rosy Song <rosysong@rosinson.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(backported from 1b4b942bce)
This commit is contained in:
Petr Štetiar
2018-11-09 12:09:29 +01:00
committed by Jo-Philipp Wich
parent c756d666dc
commit e2637a471a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/utils/iptables/Makefile
View File

@@ -462,7 +462,7 @@ define Package/libiptc
$(call Package/iptables/Default) $(call Package/iptables/Default)
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libip4tc +IPV6:libip6tc +libxtables DEPENDS:=+libip4tc +libip6tc +libxtables
ABI_VERSION:=$(PKG_VERSION) ABI_VERSION:=$(PKG_VERSION)
TITLE:=IPv4/IPv6 firewall - shared libiptc library (compatibility stub) TITLE:=IPv4/IPv6 firewall - shared libiptc library (compatibility stub)
endef endef
@@ -482,7 +482,7 @@ $(call Package/iptables/Default)
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=IPv6 firewall - shared libiptc library TITLE:=IPv6 firewall - shared libiptc library
ABI_VERSION:=$(PKG_VERSION) ABI_VERSION:=$(PKG_VERSION)
DEPENDS:=@IPV6 +libxtables DEPENDS:=+libxtables
endef endef
define Package/libxtables define Package/libxtables