From: correa at uclibc.org <correa@uclibc.org>
To: buildroot@busybox.net
Subject: [Buildroot] svn commit: trunk/buildroot/package/iptables
Date: Mon, 15 Sep 2008 19:12:24 -0700 (PDT) [thread overview]
Message-ID: <20080916021224.761813C697@busybox.net> (raw)
Author: correa
Date: 2008-09-15 19:12:23 -0700 (Mon, 15 Sep 2008)
New Revision: 23403
Log:
Fix iptables compile error by updating to Makefile.autotools.in and bumping version to 1.4.1
Modified:
trunk/buildroot/package/iptables/iptables.mk
Changeset:
Modified: trunk/buildroot/package/iptables/iptables.mk
===================================================================
--- trunk/buildroot/package/iptables/iptables.mk 2008-09-15 16:36:11 UTC (rev 23402)
+++ trunk/buildroot/package/iptables/iptables.mk 2008-09-16 02:12:23 UTC (rev 23403)
@@ -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
next reply other threads:[~2008-09-16 2:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-16 2:12 correa at uclibc.org [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-03-03 22:28 [Buildroot] svn commit: trunk/buildroot/package/iptables jacmet at uclibc.org
2008-09-18 11:08 egtvedt at uclibc.org
2008-09-18 11:20 ` Hans-Christian Egtvedt
2008-05-22 21:39 ulf at uclibc.org
2007-09-01 17:12 aldot at uclibc.org
2007-07-28 15:09 ulf at uclibc.org
2007-07-23 11:34 aldot at uclibc.org
2007-07-08 19:07 aldot at uclibc.org
2006-12-18 15:23 aldot at uclibc.org
2006-12-14 5:40 andersen at uclibc.org
2006-12-13 8:55 aldot at uclibc.org
2006-12-02 18:13 aldot at uclibc.org
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080916021224.761813C697@busybox.net \
--to=correa@uclibc.org \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox