summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/iproute2/iproute2-3.2.0
diff options
context:
space:
mode:
authorShane Wang <shane.wang@intel.com>2012-01-22 16:01:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-24 11:54:24 +0000
commitd6a55ca79c3a5637a7fa5f3309987aa41bc41b61 (patch)
tree965d57e9e4961b91b9bc65ab0e103a91a638b1b7 /meta/recipes-connectivity/iproute2/iproute2-3.2.0
parente96ec29709716ee6a01f61848d9ff2a825fcbb52 (diff)
downloadpoky-d6a55ca79c3a5637a7fa5f3309987aa41bc41b61.tar.gz
iproute2: upgrade to 3.2.0
This patch is to upgrade iproute2 to tag 3.2.0. And the tag is not fully testd by the upstream and has build error. We use the next commit of tag 3.2.0 which fixs the error. (From OE-Core rev: f2a7b225b5a243e0a364be678a71bdc3b0fa99e0) Signed-off-by: Shane Wang <shane.wang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2-3.2.0')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch76
1 files changed, 76 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch
new file mode 100644
index 0000000000..bed7b84661
--- /dev/null
+++ b/meta/recipes-connectivity/iproute2/iproute2-3.2.0/configure-cross.patch
@@ -0,0 +1,76 @@
1From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001
2From: Koen Kooi <koen@dominion.thruhere.net>
3Date: Thu, 3 Nov 2011 10:46:16 +0100
4Subject: [PATCH] make configure cross compile safe
5
6According to Kevin Tian:
7Upstream-Status: Pending
8
9Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
10Signed-off-by: Shane Wang <shane.wang@intel.com>
11
12diff -r e4e1b14b9c4a configure
13--- a/configure Sun Jan 22 15:26:47 2012 +0800
14+++ b/configure Sun Jan 22 15:29:38 2012 +0800
15@@ -2,6 +2,7 @@
16 # This is not an autconf generated configure
17 #
18 INCLUDE=${1:-"$PWD/include"}
19+SYSROOT=$1
20
21 check_atm()
22 {
23@@ -13,7 +14,7 @@
24 return 0;
25 }
26 EOF
27-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
28+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
29 if [ $? -eq 0 ]
30 then
31 echo "TC_CONFIG_ATM:=y" >>Config
32@@ -47,7 +48,7 @@
33
34 EOF
35
36-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
37+if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
38 then
39 echo "TC_CONFIG_XT:=y" >>Config
40 echo "using xtables"
41@@ -84,7 +85,7 @@
42 }
43
44 EOF
45-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
46+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
47
48 if [ $? -eq 0 ]
49 then
50@@ -124,7 +125,7 @@
51 }
52
53 EOF
54-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
55+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
56
57 if [ $? -eq 0 ]
58 then
59@@ -145,7 +146,7 @@
60 check_ipt_lib_dir()
61 {
62 IPT_LIB_DIR=""
63- for dir in /lib /usr/lib /usr/local/lib
64+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib
65 do
66 for file in $dir/{xtables,iptables}/lib*t_*so ; do
67 if [ -f $file ]; then
68@@ -168,7 +169,7 @@
69 return 0;
70 }
71 EOF
72-gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
73+$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1
74 if [ $? -eq 0 ]
75 then
76 echo "IP_CONFIG_SETNS:=y" >>Config