diff options
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch new file mode 100644 index 0000000000..92c12be83e --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-3.1.0/configure-cross.patch | |||
@@ -0,0 +1,82 @@ | |||
1 | From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Thu, 3 Nov 2011 10:46:16 +0100 | ||
4 | Subject: [PATCH] make configure cross compile safe | ||
5 | |||
6 | According to Kevin Tian: | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
10 | --- | ||
11 | configure | 13 +++++++------ | ||
12 | 1 files changed, 7 insertions(+), 6 deletions(-) | ||
13 | |||
14 | diff --git a/configure b/configure | ||
15 | index f5c3d40..bcc1948 100755 | ||
16 | --- a/configure | ||
17 | +++ b/configure | ||
18 | @@ -2,6 +2,7 @@ | ||
19 | # This is not an autconf generated configure | ||
20 | # | ||
21 | INCLUDE=${1:-"$PWD/include"} | ||
22 | +SYSROOT=$1 | ||
23 | |||
24 | check_atm() | ||
25 | { | ||
26 | @@ -13,7 +14,7 @@ int main(int argc, char **argv) { | ||
27 | return 0; | ||
28 | } | ||
29 | EOF | ||
30 | -gcc -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 | ||
31 | +$CC -I$INCLUDE -o /tmp/atmtest /tmp/atmtest.c -latm >/dev/null 2>&1 | ||
32 | if [ $? -eq 0 ] | ||
33 | then | ||
34 | echo "TC_CONFIG_ATM:=y" >>Config | ||
35 | @@ -47,7 +48,7 @@ int main(int argc, char **argv) | ||
36 | |||
37 | EOF | ||
38 | |||
39 | -if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 | ||
40 | +if $CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1 | ||
41 | then | ||
42 | echo "TC_CONFIG_XT:=y" >>Config | ||
43 | echo "using xtables" | ||
44 | @@ -84,7 +85,7 @@ int main(int argc, char **argv) { | ||
45 | } | ||
46 | |||
47 | EOF | ||
48 | -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
49 | +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
50 | |||
51 | if [ $? -eq 0 ] | ||
52 | then | ||
53 | @@ -124,7 +125,7 @@ int main(int argc, char **argv) { | ||
54 | } | ||
55 | |||
56 | EOF | ||
57 | -gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
58 | +$CC -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
59 | |||
60 | if [ $? -eq 0 ] | ||
61 | then | ||
62 | @@ -145,7 +146,7 @@ check_ipt() | ||
63 | check_ipt_lib_dir() | ||
64 | { | ||
65 | IPT_LIB_DIR="" | ||
66 | - for dir in /lib /usr/lib /usr/local/lib | ||
67 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib | ||
68 | do | ||
69 | for file in $dir/{xtables,iptables}/lib*t_*so ; do | ||
70 | if [ -f $file ]; then | ||
71 | @@ -168,7 +169,7 @@ int main(int argc, char **argv) | ||
72 | return 0; | ||
73 | } | ||
74 | EOF | ||
75 | -gcc -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 | ||
76 | +$CC -I$INCLUDE -o /tmp/setnstest /tmp/setnstest.c >/dev/null 2>&1 | ||
77 | if [ $? -eq 0 ] | ||
78 | then | ||
79 | echo "IP_CONFIG_SETNS:=y" >>Config | ||
80 | -- | ||
81 | 1.7.2.5 | ||
82 | |||