| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame^] | 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 | |