diff options
author | Constantin Musca <constantinx.musca@intel.com> | 2012-08-16 15:55:17 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-17 18:04:23 +0100 |
commit | 802849dfffc309fbd0a0a5705fc7374d10874a6c (patch) | |
tree | 0e7f3c5e26b372033005cd247fb5d6ebc7c5986c /meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch | |
parent | 52ea1f8b7a146b41d689c6a0d5169b45d75141b4 (diff) | |
download | poky-802849dfffc309fbd0a0a5705fc7374d10874a6c.tar.gz |
iproute2: upgrade to 3.5.0
(From OE-Core rev: c7f4f9fe4574cfd20925191d29e7c23b1b41eb3b)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch | 77 |
1 files changed, 77 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch new file mode 100644 index 0000000000..42f591a885 --- /dev/null +++ b/meta/recipes-connectivity/iproute2/iproute2-3.5.0/configure-cross.patch | |||
@@ -0,0 +1,77 @@ | |||
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 | Signed-off-by: Shane Wang <shane.wang@intel.com> | ||
11 | |||
12 | Index: iproute2-3.4.0/configure | ||
13 | =================================================================== | ||
14 | --- iproute2-3.4.0.orig/configure | ||
15 | +++ iproute2-3.4.0/configure | ||
16 | @@ -2,6 +2,7 @@ | ||
17 | # This is not an autconf generated configure | ||
18 | # | ||
19 | INCLUDE=${1:-"$PWD/include"} | ||
20 | +SYSROOT=$1 | ||
21 | |||
22 | # Make a temp directory in build tree. | ||
23 | TMPDIR=$(mktemp -d config.XXXXXX) | ||
24 | @@ -17,7 +18,7 @@ int main(int argc, char **argv) { | ||
25 | return 0; | ||
26 | } | ||
27 | EOF | ||
28 | -gcc -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 | ||
29 | +$CC -I$INCLUDE -o $TMPDIR/atmtest $TMPDIR/atmtest.c -latm >/dev/null 2>&1 | ||
30 | if [ $? -eq 0 ] | ||
31 | then | ||
32 | echo "TC_CONFIG_ATM:=y" >>Config | ||
33 | @@ -51,7 +52,7 @@ int main(int argc, char **argv) | ||
34 | |||
35 | EOF | ||
36 | |||
37 | -if gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 | ||
38 | +if $CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1 | ||
39 | then | ||
40 | echo "TC_CONFIG_XT:=y" >>Config | ||
41 | echo "using xtables" | ||
42 | @@ -88,7 +89,7 @@ int main(int argc, char **argv) { | ||
43 | } | ||
44 | |||
45 | EOF | ||
46 | -gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
47 | +$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
48 | |||
49 | if [ $? -eq 0 ] | ||
50 | then | ||
51 | @@ -128,7 +129,7 @@ int main(int argc, char **argv) { | ||
52 | } | ||
53 | |||
54 | EOF | ||
55 | -gcc -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
56 | +$CC -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL -ldl >/dev/null 2>&1 | ||
57 | |||
58 | if [ $? -eq 0 ] | ||
59 | then | ||
60 | @@ -149,7 +150,7 @@ check_ipt() | ||
61 | check_ipt_lib_dir() | ||
62 | { | ||
63 | IPT_LIB_DIR="" | ||
64 | - for dir in /lib /usr/lib /usr/local/lib | ||
65 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib | ||
66 | do | ||
67 | for file in $dir/{xtables,iptables}/lib*t_*so ; do | ||
68 | if [ -f $file ]; then | ||
69 | @@ -172,7 +173,7 @@ int main(int argc, char **argv) | ||
70 | return 0; | ||
71 | } | ||
72 | EOF | ||
73 | -gcc -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 | ||
74 | +$CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1 | ||
75 | if [ $? -eq 0 ] | ||
76 | then | ||
77 | echo "IP_CONFIG_SETNS:=y" >>Config | ||