X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f7225700a2459cd36bebc32791d62f367d620cc4..1938e7e2b9eab37ba42b341dfd9320f8afb73b64:/package/ipset/Makefile

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index b2095d668..06886787d 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -9,19 +9,24 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipset
-PKG_VERSION:=4.1
+PKG_VERSION:=4.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
-PKG_MD5SUM:=d104007fdf5ea64fef774c22b1c0a97b
+PKG_MD5SUM:=9060d549a18c1c0794fa47a71343d627
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/ipset/Default
+  DEPENDS:= @(!(TARGET_ps3||TARGET_pxcab)||BROKEN)
+endef
+
 define Package/ipset
+$(call Package/ipset/Default)
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:= @LINUX_2_6 +iptables-mod-ipset +kmod-ipt-ipset
+  DEPENDS+= +iptables-mod-ipset +kmod-ipt-ipset
   TITLE:=IPset administration utility
   URL:=http://ipset.netfilter.org/
 endef
@@ -31,7 +36,7 @@ include $(INCLUDE_DIR)/kernel-defaults.mk
 IPSET_MAKEOPTS:= -C $(PKG_BUILD_DIR) \
 	$(TARGET_CONFIGURE_OPTS) \
 	COPT_FLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="-rdynamic -static-libgcc" \
+	LDFLAGS="-rdynamic" \
 	NO_EXTRA_WARN_FLAGS=yes \
 	KERNEL_DIR="$(LINUX_DIR)" \
 	PREFIX=/usr \
@@ -67,9 +72,10 @@ define Package/ipset/install
 endef
 
 define KernelPackage/ipt-ipset
+$(call Package/ipset/Default)
   SUBMENU:=Netfilter Extensions
   TITLE:=IPset netfilter modules
-  DEPENDS:= @LINUX_2_6 kmod-ipt-core
+  DEPENDS+= kmod-ipt-core
   FILES:=$(foreach mod,$(IPSET_MODULES),$(PKG_BUILD_DIR)/kernel/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,46,$(IPSET_MODULES))
 endef