diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-09-27 15:25:45 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-09-30 16:55:21 +0100 |
commit | 7d751fc737ab678d4f5b1a85b86b6d40e98822f1 (patch) | |
tree | 173086574dd69d454e656a2ffcc5b95a01d8596f /meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch | |
parent | ec1104fd7fc0311e918fa832a566d3c8aedc2f11 (diff) | |
download | poky-7d751fc737ab678d4f5b1a85b86b6d40e98822f1.tar.gz |
apr: Check for libtoolize rather than libtool
Backport a patch from debian to make it check libtoolize rather than libtool.
https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch
This can also fix:
$ bitbake nativesdk-apr
buildconf: libtool not found.
You need libtool version 1.4 or newer installed
(From OE-Core rev: 1a1b9e3ff33dea964bdf79bc47b5c7801e4df5a5)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch b/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch deleted file mode 100644 index 097c195a19..0000000000 --- a/meta/recipes-support/apr/apr/0001-build-buildcheck.sh-improve-libtool-detection.patch +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | From 4efdc06fb17b8a00a9eca923caa176be741d1e04 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Thu, 1 Feb 2018 14:56:13 +0800 | ||
4 | Subject: [PATCH 1/7] build/buildcheck.sh: improve libtool detection | ||
5 | |||
6 | Support customize libtool by variable assigning, it is helpful | ||
7 | for cross compileing (such as libtool=aarch64-linux-libtool) | ||
8 | |||
9 | Upstream-Status: Submitted [https://github.com/apache/apr/pull/8] | ||
10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
11 | --- | ||
12 | build/buildcheck.sh | 4 +++- | ||
13 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/build/buildcheck.sh b/build/buildcheck.sh | ||
16 | index ab5df44..f191a41 100755 | ||
17 | --- a/build/buildcheck.sh | ||
18 | +++ b/build/buildcheck.sh | ||
19 | @@ -40,7 +40,9 @@ fi | ||
20 | # output is multiline from 1.5 onwards | ||
21 | |||
22 | # Require libtool 1.4 or newer | ||
23 | -libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` | ||
24 | +if test -z "$libtool"; then | ||
25 | + libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` | ||
26 | +fi | ||
27 | lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` | ||
28 | if test -z "$lt_pversion"; then | ||
29 | echo "buildconf: libtool not found." | ||
30 | -- | ||
31 | 1.8.3.1 | ||
32 | |||