xref: /OK3568_Linux_fs/yocto/poky/meta/recipes-support/apr/apr/libtoolize_check.patch (revision 4882a59341e53eb6f0b4789bf948001014eff981)
1From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001
2From: Helmut Grohne <helmut@subdivi.de>
3Date: Tue, 7 Feb 2023 07:04:00 +0000
4Subject: [PATCH] check for libtoolize rather than libtool
5
6libtool is now in package libtool-bin, but apr only needs libtoolize.
7
8Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ]
9
10Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
11
12---
13 build/buildcheck.sh | 10 ++++------
14 1 file changed, 4 insertions(+), 6 deletions(-)
15
16diff --git a/build/buildcheck.sh b/build/buildcheck.sh
17index 44921b5..08bc8a8 100755
18--- a/build/buildcheck.sh
19+++ b/build/buildcheck.sh
20@@ -39,13 +39,11 @@ fi
21 # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
22 # output is multiline from 1.5 onwards
23
24-# Require libtool 1.4 or newer
25-if test -z "$libtool"; then
26-  libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
27-fi
28-lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
29+# Require libtoolize 1.4 or newer
30+libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
31+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
32 if test -z "$lt_pversion"; then
33-  echo "buildconf: libtool not found."
34+  echo "buildconf: libtoolize not found."
35   echo "           You need libtool version 1.4 or newer installed"
36   echo "           to build APR from SVN."
37   res=1
38