diff options
| author | Jordan Yelloz <jordan@yelloz.me> | 2016-06-12 20:13:40 -0700 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-07-05 13:16:36 +0200 |
| commit | bcfe05a7e9ce49bcc447fd956f52da0032f534e6 (patch) | |
| tree | 672c5454388dc9555ee4b8706ee24c3a4ccacd9d /package/iptables | |
| parent | 7e2fdc14a1317d52d57f97d83ffb2651b05431cd (diff) | |
iptables: add upstream patch to fix AR substitution
This ensures the correct AR is used for some of the iptables build
process. This is the same fix as
<https://bugs.gentoo.org/show_bug.cgi?id=444282>
Signed-off-by: Jordan Yelloz <jordan@yelloz.me>
[Thomas: use upstream patch instead of passing AR in the environment.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/iptables')
| -rw-r--r-- | package/iptables/0003-extensions-added-AR-substitution.patch | 33 | ||||
| -rw-r--r-- | package/iptables/iptables.mk | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/package/iptables/0003-extensions-added-AR-substitution.patch b/package/iptables/0003-extensions-added-AR-substitution.patch new file mode 100644 index 000000000..b522ba747 --- /dev/null +++ b/package/iptables/0003-extensions-added-AR-substitution.patch @@ -0,0 +1,33 @@ +From eca9b91b832dfc27d0e1a6d08e2ce4878f229373 Mon Sep 17 00:00:00 2001 +From: Jordan Yelloz <jordan@yelloz.me> +Date: Fri, 24 Jun 2016 12:18:45 -0700 +Subject: [PATCH] extensions: added AR substitution + +This is to ensure that the correct AR is run in cross-compile jobs. +Often a cross-compile build will succeed without this change but it +fails on my Gentoo Linux system when I have binutils installed with the +"multitarget" USE flag. +This change substitues AR with the autotools-supplied AR for the +extensions subdirectory. + +Signed-off-by: Jordan Yelloz <jordan@yelloz.me> +Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> +--- + extensions/GNUmakefile.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in +index 53be2cd..33b06ef 100644 +--- a/extensions/GNUmakefile.in ++++ b/extensions/GNUmakefile.in +@@ -11,6 +11,7 @@ libdir = @libdir@ + libexecdir = @libexecdir@ + xtlibdir = @xtlibdir@ + ++AR = @AR@ + CC = @CC@ + CCLD = ${CC} + CFLAGS = @CFLAGS@ +-- +2.7.4 + diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk index 12e00f238..a8ebec881 100644 --- a/package/iptables/iptables.mk +++ b/package/iptables/iptables.mk @@ -16,6 +16,7 @@ IPTABLES_LICENSE_FILES = COPYING IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \ $(if $(BR2_STATIC_LIBS),,--disable-static) # For 0002-iptables-add-xtables-config-parser.h-to-BUILT_SOURCES.patch +# and 0003-extensions-added-AR-substitution.patch IPTABLES_AUTORECONF = YES # For connlabel match |