diff options
author | Koen Kooi <koen@dominion.thruhere.net> | 2011-11-03 10:52:50 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-07 14:03:37 +0000 |
commit | addcb5106ca0b1849299d6ad4e734135da29b0ab (patch) | |
tree | d8121b8a1d2acba61b3a28558d276f4210874171 /meta/recipes-connectivity/iproute2/iproute2-3.0.0 | |
parent | 6c7b71d9a3e855760acacef6949665a305bac2c0 (diff) | |
download | openembedded-core-addcb5106ca0b1849299d6ad4e734135da29b0ab.tar.gz openembedded-core-addcb5106ca0b1849299d6ad4e734135da29b0ab.tar.bz2 openembedded-core-addcb5106ca0b1849299d6ad4e734135da29b0ab.tar.xz openembedded-core-addcb5106ca0b1849299d6ad4e734135da29b0ab.zip |
iproute2: update to 3.0.0 to fix build with updated iptables
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2-3.0.0')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch new file mode 100644 index 000000000..92c12be83 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-3.0.0/configure-cross.patch @@ -0,0 +1,82 @@ +From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 +From: Koen Kooi <koen@dominion.thruhere.net> +Date: Thu, 3 Nov 2011 10:46:16 +0100 +Subject: [PATCH] make configure cross compile safe + +According to Kevin Tian: +Upstream-Status: Pending + +Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> +--- + configure | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/configure b/configure +index f5c3d40..bcc1948 100755 +--- a/configure ++++ b/configure +@@ -2,6 +2,7 @@ + # This is not an autconf generated configure + # + INCLUDE=${1:-"$PWD/include"} ++SYSROOT=$1 + + check_atm() + { +@@ -13,7 +14,7 @@ int main(int argc, char **argv) { + return 0; + } + EOF +-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 ++$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 + if [ $? -eq 0 ] + then + echo "TC_CONFIG_ATM:=y" >>Config +@@ -47,7 +48,7 @@ int main(int argc, char **argv) + + EOF + +-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 ++if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 + then + echo "TC_CONFIG_XT:=y" >>Config + echo "using xtables" +@@ -84,7 +85,7 @@ int main(int argc, char **argv) { + } + + EOF +-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 + + if [ $? -eq 0 ] + then +@@ -124,7 +125,7 @@ int main(int argc, char **argv) { + } + + EOF +-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 ++$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 + + if [ $? -eq 0 ] + then +@@ -145,7 +146,7 @@ check_ipt() + check_ipt_lib_dir() + { + IPT_LIB_DIR="" +- for dir in /lib /usr/lib /usr/local/lib ++ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib + do + for file in $dir/{xtables,iptables}/lib*t_*so ; do + if [ -f $file ]; then +@@ -168,7 +169,7 @@ int main(int argc, char **argv) + return 0; + } + EOF +-gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 ++$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 + if [ $? -eq 0 ] + then + echo "IP_CONFIG_SETNS:=y" >>Config +-- +1.7.2.5 + |