diff mbox series

[17/18] apr: drop libtoolize_check.patch

Message ID 20250407094045.753021-17-alex.kanavin@gmail.com
State New
Headers show
Series [01/18] nfs-utils: replace problematic pending patch with upstream submission | expand

Commit Message

Alexander Kanavin April 7, 2025, 9:40 a.m. UTC 
From: Alexander Kanavin <alex@linutronix.de>

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.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 .../apr/apr/libtoolize_check.patch            | 37 -------------------
 meta/recipes-support/apr/apr_1.7.5.bb         |  1 -
 2 files changed, 38 deletions(-)
 delete mode 100644 meta/recipes-support/apr/apr/libtoolize_check.patch
diff mbox series

Patch

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 80ce43caa40..00000000000
--- a/meta/recipes-support/apr/apr/libtoolize_check.patch
+++ /dev/null
@@ -1,37 +0,0 @@ 
-From 17835709bc55657b7af1f7c99b3f572b819cf97e Mon Sep 17 00:00:00 2001
-From: Helmut Grohne <helmut@subdivi.de>
-Date: Tue, 7 Feb 2023 07:04:00 +0000
-Subject: [PATCH] check for libtoolize rather than libtool
-
-libtool is now in package libtool-bin, but apr only needs libtoolize.
-
-Upstream-Status: Pending [ from debian: https://sources.debian.org/data/main/a/apr/1.6.5-1/debian/patches/libtoolize_check.patch ]
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
----
- build/buildcheck.sh | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/build/buildcheck.sh b/build/buildcheck.sh
-index 44921b5..08bc8a8 100755
---- a/build/buildcheck.sh
-+++ b/build/buildcheck.sh
-@@ -39,13 +39,11 @@ fi
- # ltmain.sh (GNU libtool 1.1361 2004/01/02 23:10:52) 1.5a
- # output is multiline from 1.5 onwards
- 
--# Require libtool 1.4 or newer
--if test -z "$libtool"; then
--  libtool=`build/PrintPath glibtool1 glibtool libtool libtool15 libtool14`
--fi
--lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
-+# Require libtoolize 1.4 or newer
-+libtoolize=`build/PrintPath glibtoolize1 glibtoolize libtoolize libtoolize15 libtoolize14`
-+lt_pversion=`$libtoolize --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'`
- if test -z "$lt_pversion"; then
--  echo "buildconf: libtool not found."
-+  echo "buildconf: libtoolize not found."
-   echo "           You need libtool version 1.4 or newer installed"
-   echo "           to build APR from SVN."
-   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 215ac4b4b8b..83d84bfdb64 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 \
            file://0002-apr-Remove-workdir-path-references-from-installed-ap.patch \
            file://0004-Fix-packet-discards-HTTP-redirect.patch \
            file://0005-configure.in-fix-LTFLAGS-to-make-it-work-with-ccache.patch \
-           file://libtoolize_check.patch \
            file://0001-Add-option-to-disable-timed-dependant-tests.patch \
            file://0001-configure-Remove-runtime-test-for-mmap-that-can-map-.patch \
            file://autoconf-2.73.patch \