Revert "iptables: fix dependency for libip6tc on IPV6"
This patch reverts commit2dc1f54b12as it breaks the build for me on x86-64 if I've IPV6 support disabled. Same config builds fine on `openwrt-18.06` branch at55d078b2. $ 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>
This commit is contained in:
		
				
					committed by
					
						
						Hans Dedecker
					
				
			
			
				
	
			
			
			
						parent
						
							5617e138bd
						
					
				
				
					commit
					1b4b942bce
				
			@@ -492,7 +492,7 @@ define Package/libiptc
 | 
			
		||||
$(call Package/iptables/Default)
 | 
			
		||||
  SECTION:=libs
 | 
			
		||||
  CATEGORY:=Libraries
 | 
			
		||||
  DEPENDS:=+libip4tc +IPV6:libip6tc +libxtables
 | 
			
		||||
  DEPENDS:=+libip4tc +libip6tc +libxtables
 | 
			
		||||
  ABI_VERSION:=$(PKG_VERSION)
 | 
			
		||||
  TITLE:=IPv4/IPv6 firewall - shared libiptc library (compatibility stub)
 | 
			
		||||
endef
 | 
			
		||||
@@ -512,7 +512,7 @@ $(call Package/iptables/Default)
 | 
			
		||||
  CATEGORY:=Libraries
 | 
			
		||||
  TITLE:=IPv6 firewall - shared libiptc library
 | 
			
		||||
  ABI_VERSION:=$(PKG_VERSION)
 | 
			
		||||
  DEPENDS:=@IPV6 +libxtables
 | 
			
		||||
  DEPENDS:=+libxtables
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
define Package/libxtables
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user