diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-01-20 11:25:18 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-01-20 11:25:18 +0000 |
commit | e92abf23629d56a68692569be6835ac0ad9f1f0a (patch) | |
tree | 78ae9e02acb3864a7bcf257f1893d0353498a129 /package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch | |
parent | b5a9786bc087f3de1ac6046e84c56fa6a04bf2e8 (diff) | |
download | upstream-e92abf23629d56a68692569be6835ac0ad9f1f0a.tar.gz upstream-e92abf23629d56a68692569be6835ac0ad9f1f0a.tar.bz2 upstream-e92abf23629d56a68692569be6835ac0ad9f1f0a.zip |
network/iproute2: Bump version to 3.7.0
Updated to latest stable version and added an upstream patch to handle
a link failure
Signed-off-by: Oliver Smith <olipro@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa>
[dgolle@allnet.de: refreshed patches]
Signed-off-by: Daniel Golle <dgolle@allnet.de>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35250 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch')
-rw-r--r-- | package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch b/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch new file mode 100644 index 0000000000..7fb2c11b2e --- /dev/null +++ b/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch @@ -0,0 +1,58 @@ +From 11e8a1034656eba6571401286b99dabbd9842dac Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <jengelh@inai.de> +Date: Tue, 18 Dec 2012 09:18:45 -0800 +Subject: [PATCH] build: unbreak linakge of m_xt.so + +Commit v3.7.0~10 caused the variable new PKG_CONFIG variable never +to be present at the time of calling make, leading to tc/m_xt.so +not linked with -lxtables (result from pkg-config xtables --libs), +that in turn leading to + +tc: symbol lookup error: /usr/lib64/tc//m_xt.so: undefined symbol: +xtables_init_all + +Fixing that. + +Signed-off-by: Jan Engelhardt <jengelh@inai.de> + +Conflicts: + configure +--- + configure | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +--- a/configure ++++ b/configure +@@ -2,14 +2,20 @@ + # This is not an autconf generated configure + # + INCLUDE=${1:-"$PWD/include"} +-: ${PKG_CONFIG:=pkg-config} +-: ${CC=gcc} +-echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config + + # Make a temp directory in build tree. + TMPDIR=$(mktemp -d config.XXXXXX) + trap 'status=$?; rm -rf $TMPDIR; exit $status' EXIT HUP INT QUIT TERM + ++check_toolchain() ++{ ++: ${PKG_CONFIG:=pkg-config} ++: ${AR=ar} ++: ${CC=gcc} ++echo "AR:=${AR}" >>Config ++echo "CC:=${CC}" >>Config ++} ++ + check_atm() + { + cat >$TMPDIR/atmtest.c <<EOF +@@ -224,6 +230,8 @@ rm -f $TMPDIR/ipsettest.c $TMPDIR/ipsett + } + + echo "# Generated config based on" $INCLUDE >Config ++echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config ++check_toolchain + + echo "TC schedulers" + |