diff options
Diffstat (limited to 'meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch')
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch index 8b75a2ada4..b0c4a088fa 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | From 85b0589b4843c03e8e6fd9416d71ea449a73c5c0 Mon Sep 17 00:00:00 2001 | 1 | From 3835b1cc4a55361443c2b37dea688da652217635 Mon Sep 17 00:00:00 2001 |
2 | From: Koen Kooi <koen@dominion.thruhere.net> | 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
3 | Date: Thu, 3 Nov 2011 10:46:16 +0100 | 3 | Date: Sun, 31 Mar 2019 17:32:07 +0200 |
4 | Subject: [PATCH] make configure cross compile safe | 4 | Subject: [PATCH] make configure cross compile safe |
5 | 5 | ||
6 | According to Kevin Tian: | 6 | According to Kevin Tian: |
@@ -9,11 +9,15 @@ Upstream-Status: Pending | |||
9 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | 9 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
10 | Signed-off-by: Shane Wang <shane.wang@intel.com> | 10 | Signed-off-by: Shane Wang <shane.wang@intel.com> |
11 | 11 | ||
12 | Index: iproute2-4.14.1/configure | 12 | --- |
13 | =================================================================== | 13 | configure | 3 ++- |
14 | --- iproute2-4.14.1.orig/configure | 14 | 1 file changed, 2 insertions(+), 1 deletion(-) |
15 | +++ iproute2-4.14.1/configure | 15 | |
16 | @@ -2,6 +2,7 @@ | 16 | diff --git a/configure b/configure |
17 | index 45fcffb6..0c5c9146 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -3,6 +3,7 @@ | ||
17 | # This is not an autoconf generated configure | 21 | # This is not an autoconf generated configure |
18 | # | 22 | # |
19 | INCLUDE=${1:-"$PWD/include"} | 23 | INCLUDE=${1:-"$PWD/include"} |
@@ -21,12 +25,15 @@ Index: iproute2-4.14.1/configure | |||
21 | 25 | ||
22 | # Output file which is input to Makefile | 26 | # Output file which is input to Makefile |
23 | CONFIG=config.mk | 27 | CONFIG=config.mk |
24 | @@ -195,7 +196,7 @@ check_ipt_lib_dir() | 28 | @@ -162,7 +163,7 @@ check_ipt_lib_dir() |
25 | return | 29 | return |
26 | fi | 30 | fi |
27 | 31 | ||
28 | - for dir in /lib /usr/lib /usr/local/lib | 32 | - for dir in /lib /usr/lib /usr/local/lib; do |
29 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib | 33 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib; do |
30 | do | 34 | for file in "xtables" "iptables"; do |
31 | for file in $dir/{xtables,iptables}/lib*t_*so ; do | 35 | file="$dir/$file/lib*t_*so" |
32 | if [ -f $file ]; then | 36 | if [ -f $file ]; then |
37 | -- | ||
38 | 2.17.1 | ||
39 | |||