summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-11-03 10:52:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-07 14:05:40 +0000
commit163f7bda55ff76da27ca28110bd965704c628303 (patch)
tree02e9133cb2ca164f716496b5212743d456c607c6 /meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
parent4a279e2410b923ff7d3c7692206ee51e3098ed23 (diff)
downloadpoky-163f7bda55ff76da27ca28110bd965704c628303.tar.gz
iproute2: update to 3.0.0 to fix build with updated iptables
(From OE-Core rev: addcb5106ca0b1849299d6ad4e734135da29b0ab) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch')
-rw-r--r--meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch63
1 files changed, 0 insertions, 63 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
deleted file mode 100644
index e26e8effd6..0000000000
--- a/meta/recipes-connectivity/iproute2/iproute2-2.6.38/configure-cross.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1Upstream-Status: Pending
2
3# borrow from OE, to handle cross compile mess
4#
5# ktian1, 06/28/2010
6Index: iproute2-2.6.34/configure
7===================================================================
8--- iproute2-2.6.34.orig/configure
9+++ iproute2-2.6.34/configure
10@@ -4,7 +4,7 @@
11 INCLUDE=${1:-"$PWD/include"}
12
13 TABLES=
14-
15+SYSROOT=$1
16 check_atm()
17 {
18 cat >/tmp/atmtest.c <<EOF
19@@ -15,7 +15,7 @@ int main(int argc, char **argv) {
20 return 0;
21 }
22 EOF
23-gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
24+$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1
25 if [ $? -eq 0 ]
26 then
27 echo "TC_CONFIG_ATM:=y" >>Config
28@@ -49,7 +49,7 @@ int main(int argc, char **argv)
29
30 EOF
31
32-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
33+if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
34 then
35 echo "TC_CONFIG_XT:=y" >>Config
36 echo "using xtables"
37@@ -86,7 +86,7 @@ int main(int argc, char **argv) {
38 }
39
40 EOF
41-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
42+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
43
44 if [ $? -eq 0 ]
45 then
46@@ -126,7 +126,7 @@ int main(int argc, char **argv) {
47 }
48
49 EOF
50-gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
51+$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1
52
53 if [ $? -eq 0 ]
54 then
55@@ -150,7 +150,7 @@ check_ipt()
56 check_ipt_lib_dir()
57 {
58 IPT_LIB_DIR=""
59- for dir in /lib /usr/lib /usr/local/lib
60+ for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib
61 do
62 for file in $dir/$TABLES/lib*t_*so ; do
63 if [ -f $file ]; then