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/libtoolize_check.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/libtoolize_check.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/libtoolize_check.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch new file mode 100644 index 0000000000..740792e6b0 --- /dev/null +++ b/meta/recipes-support/apr/apr/libtoolize_check.patch | |||
@@ -0,0 +1,28 @@ | |||
1 | From: Helmut Grohne <helmut@subdivi.de> | ||
2 | Subject: check for libtoolize rather than libtool | ||
3 | Last-Update: 2014-09-19 | ||
4 | |||
5 | libtool is now in package libtool-bin, but apr only needs libtoolize. | ||
6 | |||
7 | Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ] | ||
8 | |||
9 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
10 | |||
11 | --- apr.orig/build/buildcheck.sh | ||
12 | +++ apr/build/buildcheck.sh | ||
13 | @@ -39,11 +39,11 @@ fi | ||
14 | # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a | ||
15 | # output is multiline from 1.5 onwards | ||
16 | |||
17 | -# Require libtool 1.4 or newer | ||
18 | -libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` | ||
19 | -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` | ||
20 | +# Require libtoolize 1.4 or newer | ||
21 | +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` | ||
22 | +lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` | ||
23 | if test -z "$lt_pversion"; then | ||
24 | - echo "buildconf: libtool not found." | ||
25 | + echo "buildconf: libtoolize not found." | ||
26 | echo " You need libtool version 1.4 or newer installed" | ||
27 | echo " to build APR from SVN." | ||
28 | res=1 | ||