diff options
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch | 39 | ||||
-rw-r--r-- | meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb | 1 |
2 files changed, 0 insertions, 40 deletions
diff --git a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch b/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch deleted file mode 100644 index b0c4a088fa..0000000000 --- a/meta/recipes-connectivity/iproute2/iproute2/configure-cross.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 3835b1cc4a55361443c2b37dea688da652217635 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Sun, 31 Mar 2019 17:32:07 +0200 | ||
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 | --- | ||
13 | configure | 3 ++- | ||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/configure b/configure | ||
17 | index 45fcffb6..0c5c9146 100755 | ||
18 | --- a/configure | ||
19 | +++ b/configure | ||
20 | @@ -3,6 +3,7 @@ | ||
21 | # This is not an autoconf generated configure | ||
22 | # | ||
23 | INCLUDE=${1:-"$PWD/include"} | ||
24 | +SYSROOT=$1 | ||
25 | |||
26 | # Output file which is input to Makefile | ||
27 | CONFIG=config.mk | ||
28 | @@ -162,7 +163,7 @@ check_ipt_lib_dir() | ||
29 | return | ||
30 | fi | ||
31 | |||
32 | - for dir in /lib /usr/lib /usr/local/lib; do | ||
33 | + for dir in $SYSROOT/lib $SYSROOT/usr/lib $SYSROOT/usr/local/lib; do | ||
34 | for file in "xtables" "iptables"; do | ||
35 | file="$dir/$file/lib*t_*so" | ||
36 | if [ -f $file ]; then | ||
37 | -- | ||
38 | 2.17.1 | ||
39 | |||
diff --git a/meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb b/meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb index 8ef529d91a..1728cd69a1 100644 --- a/meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb +++ b/meta/recipes-connectivity/iproute2/iproute2_5.2.0.bb | |||
@@ -1,7 +1,6 @@ | |||
1 | require iproute2.inc | 1 | require iproute2.inc |
2 | 2 | ||
3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ | 3 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/net/${BPN}/${BP}.tar.xz \ |
4 | file://configure-cross.patch \ | ||
5 | file://0001-libc-compat.h-add-musl-workaround.patch \ | 4 | file://0001-libc-compat.h-add-musl-workaround.patch \ |
6 | " | 5 | " |
7 | 6 | ||