diff options
Diffstat (limited to 'meta/recipes-support/apr/apr/libtoolize_check.patch')
-rw-r--r-- | meta/recipes-support/apr/apr/libtoolize_check.patch | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch index 740792e6b0..80ce43caa4 100644 --- a/meta/recipes-support/apr/apr/libtoolize_check.patch +++ b/meta/recipes-support/apr/apr/libtoolize_check.patch | |||
@@ -1,6 +1,7 @@ | |||
1 | From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001 | ||
1 | From: Helmut Grohne <helmut@subdivi.de> | 2 | From: Helmut Grohne <helmut@subdivi.de> |
2 | Subject: check for libtoolize rather than libtool | 3 | Date: Tue, 7 Feb 2023 07:04:00 +0000 |
3 | Last-Update: 2014-09-19 | 4 | Subject: [PATCH] check for libtoolize rather than libtool |
4 | 5 | ||
5 | libtool is now in package libtool-bin, but apr only needs libtoolize. | 6 | libtool is now in package libtool-bin, but apr only needs libtoolize. |
6 | 7 | ||
@@ -8,14 +9,22 @@ Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/a | |||
8 | 9 | ||
9 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 10 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
10 | 11 | ||
11 | --- apr.orig/build/buildcheck.sh | 12 | --- |
12 | +++ apr/build/buildcheck.sh | 13 | build/buildcheck.sh | 10 ++++------ |
13 | @@ -39,11 +39,11 @@ fi | 14 | 1 file changed, 4 insertions(+), 6 deletions(-) |
15 | |||
16 | diff --git a/build/buildcheck.sh b/build/buildcheck.sh | ||
17 | index 44921b5..08bc8a8 100755 | ||
18 | --- a/build/buildcheck.sh | ||
19 | +++ b/build/buildcheck.sh | ||
20 | @@ -39,13 +39,11 @@ fi | ||
14 | # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a | 21 | # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a |
15 | # output is multiline from 1.5 onwards | 22 | # output is multiline from 1.5 onwards |
16 | 23 | ||
17 | -# Require libtool 1.4 or newer | 24 | -# Require libtool 1.4 or newer |
18 | -libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` | 25 | -if test -z "$libtool"; then |
26 | - libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14` | ||
27 | -fi | ||
19 | -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` | 28 | -lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` |
20 | +# Require libtoolize 1.4 or newer | 29 | +# Require libtoolize 1.4 or newer |
21 | +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` | 30 | +libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14` |