summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2025-04-07 11:40:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2025-04-10 11:05:34 +0100
commit9d3823ef09ef68b43f301906f5ac6354d3813abd (patch)
treefeb35ee620f89f3d9183b5c8388e0ed6111effb1
parentef42fff1b12ab74833b8527a9483d7a9ae6f7f9e (diff)
downloadpoky-9d3823ef09ef68b43f301906f5ac6354d3813abd.tar.gz
apr: drop libtoolize_check.patch
It's not clear what the intent was: libtool executable is present in the native sysroot and can be used to obtain versions during build time. (From OE-Core rev: 9d16c45ed4caea9b0e3fe6e5dad983707dd10c65) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/apr/apr/libtoolize_check.patch37
-rw-r--r--meta/recipes-support/apr/apr_1.7.5.bb1
2 files changed, 0 insertions, 38 deletions
diff --git a/meta/recipes-support/apr/apr/libtoolize_check.patch b/meta/recipes-support/apr/apr/libtoolize_check.patch
deleted file mode 100644
index 80ce43caa4..0000000000
--- a/meta/recipes-support/apr/apr/libtoolize_check.patch
+++ /dev/null
@@ -1,37 +0,0 @@
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
diff --git a/meta/recipes-support/apr/apr_1.7.5.bb b/meta/recipes-support/apr/apr_1.7.5.bb
index 215ac4b4b8..83d84bfdb6 100644
--- a/meta/recipes-support/apr/apr_1.7.5.bb
+++ b/meta/recipes-support/apr/apr_1.7.5.bb
@@ -18,7 +18,6 @@ SRC_URI = "${APACHE_MIRROR}/apr/${BPN}-${PV}.tar.bz2 \
18 file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \ 18 file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \
19 file://0004-Fix-packet-discards-HTTP-redirect.patch \ 19 file://0004-Fix-packet-discards-HTTP-redirect.patch \
20 file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \ 20 file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
21 file://libtoolize_check.patch \
22 file://0001-Add-option-to-disable-timed-dependant-tests.patch \ 21 file://0001-Add-option-to-disable-timed-dependant-tests.patch \
23 file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \ 22 file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \
24 file://autoconf-2.73.patch \ 23 file://autoconf-2.73.patch \