diff options
| author | Thiago A. Corrêa <thiago.correa@gmail.com> | 2008-09-16 02:12:23 +0000 |
|---|---|---|
| committer | Thiago A. Corrêa <thiago.correa@gmail.com> | 2008-09-16 02:12:23 +0000 |
| commit | 1b821fe7de90e53fe1cdab4faa8986c8b2b64909 (patch) | |
| tree | cf3a3cf9e767325b014daa11b82626e9725df9a3 /package | |
| parent | f4b178495e1febc12208e5c8f0520ccbc670ee7c (diff) | |
Fix iptables compile error by updating to Makefile.autotools.in and bumping version to 1.4.1
Diffstat (limited to 'package')
| -rw-r--r-- | package/iptables/iptables.mk | 68 |
1 files changed, 11 insertions, 57 deletions
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index e255bee44..43f02827a 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -3,64 +3,18 @@ # iptables # ############################################################# -IPTABLES_VERSION:=1.3.8 -IPTABLES_SOURCE_URL:=http://ftp.netfilter.org/pub/iptables -IPTABLES_SOURCE:=iptables-$(IPTABLES_VERSION).tar.bz2 -IPTABLES_CAT:=$(BZCAT) -IPTABLES_BUILD_DIR:=$(BUILD_DIR)/iptables-$(IPTABLES_VERSION) +IPTABLES_VERSION = 1.4.1 +IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 +IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables -$(DL_DIR)/$(IPTABLES_SOURCE): - $(WGET) -P $(DL_DIR) $(IPTABLES_SOURCE_URL)/$(IPTABLES_SOURCE) +IPTABLES_INSTALL_STAGING = NO +IPTABLES_INSTALL_TARGET = YES +IPTABLES_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install-exec-am -$(IPTABLES_BUILD_DIR)/.unpacked: $(DL_DIR)/$(IPTABLES_SOURCE) - $(IPTABLES_CAT) $(DL_DIR)/$(IPTABLES_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - touch $@ +IPTABLES_AUTORECONF = YES +IPTABLES_DEPENDENCIES = +IPTABLES_CONFIGURE_OPT = --with-kernel=$(LINUX_HEADERS_DIR) +IPTABLES_MAKE_OPT = GLIB_GENMARSHAL=/usr/bin/glib-genmarshal GLIB_MKENUMS=/usr/bin -$(IPTABLES_BUILD_DIR)/.configured: $(IPTABLES_BUILD_DIR)/.unpacked - # Allow patches. Needed for openwrt for instance. - toolchain/patch-kernel.sh $(IPTABLES_BUILD_DIR) package/iptables/ iptables\*.patch - # - $(SED) "s;\[ -f /usr/include/netinet/ip6.h \];grep -q '__UCLIBC_HAS_IPV6__ 1' \ - $(STAGING_DIR)/usr/include/bits/uClibc_config.h;" $(IPTABLES_BUILD_DIR)/Makefile - touch $@ +$(eval $(call AUTOTARGETS,package,iptables)) -$(IPTABLES_BUILD_DIR)/iptables: $(IPTABLES_BUILD_DIR)/.configured - $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(IPTABLES_BUILD_DIR) \ - KERNEL_DIR=$(LINUX_HEADERS_DIR) \ - COPT_FLAGS="$(TARGET_CFLAGS)" \ - PREFIX=/usr \ - INCDIR="\$$(PREFIX)/include" \ - MANDIR="\$$(PREFIX)/share/man" - -$(TARGET_DIR)/usr/sbin/iptables: $(IPTABLES_BUILD_DIR)/iptables - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(IPTABLES_BUILD_DIR) \ - KERNEL_DIR=$(LINUX_HEADERS_DIR) \ - COPT_FLAGS="$(TARGET_CFLAGS)" \ - PREFIX=/usr \ - INCDIR="\$$(PREFIX)/include" \ - MANDIR="\$$(PREFIX)/share/man" \ - DESTDIR=$(TARGET_DIR) install - $(STRIPCMD) $(TARGET_DIR)/usr/sbin/iptables* - $(STRIPCMD) $(TARGET_DIR)/usr/lib/iptables/*.so -ifneq ($(BR2_HAVE_MANPAGES),y) - rm -rf $(TARGET_DIR)/usr/share/man -endif - -iptables: $(TARGET_DIR)/usr/sbin/iptables - -iptables-source: $(DL_DIR)/$(IPTABLES_SOURCE) - -iptables-clean: - -$(MAKE1) -C $(IPTABLES_BUILD_DIR) clean - rm -rf $(TARGET_DIR)/usr/sbin/iptables* $(TARGET_DIR)/usr/lib/iptables - -iptables-dirclean: - rm -rf $(IPTABLES_BUILD_DIR) -############################################################# -# -# Toplevel Makefile options -# -############################################################# -ifeq ($(strip $(BR2_PACKAGE_IPTABLES)),y) -TARGETS+=iptables -endif |