Updated to latest stable version and added an upstream patch to handle a link failure
Signed-off-by: Oliver Smith <oli...@8.c.9.b.0.7.4.0.1.0.0.2.ip6.arpa> --- package/network/utils/iproute2/Makefile | 4 +- .../210-build-unbreak-linkage-of-m_xt.so.patch | 63 ++++++++++++++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 256064e..578010f 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.3.0 +PKG_VERSION:=3.7.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=308e7145218dd552c2766fe527e239e1 +PKG_MD5SUM:=47040899f8fa30c8721fc5aec6509b44 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/iproute2-$(PKG_VERSION) 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 0000000..39d53d0 --- /dev/null +++ b/package/network/utils/iproute2/patches/210-build-unbreak-linkage-of-m_xt.so.patch @@ -0,0 +1,63 @@ +From 11e8a1034656eba6571401286b99dabbd9842dac Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt <jeng...@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 <jeng...@inai.de> + +Conflicts: + configure +--- + configure | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 9912114..f0540c3 100755 +--- 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/ipsettest + } + + echo "# Generated config based on" $INCLUDE >Config ++echo "PKG_CONFIG:=${PKG_CONFIG}" >>Config ++check_toolchain + + echo "TC schedulers" + +-- +1.8.0.2 + -- 1.8.0.2 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
