diff mbox series

[4/4] libtool: Drop obsolete configure/compile prepends

Message ID 20240603133938.3552266-4-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit d6a22998e47bcceee3fc3edc72eb2df2970dabfa
Headers show
Series [1/4] libtool: 2.4.7 -> 2.5.0 | expand

Commit Message

Richard Purdie June 3, 2024, 1:39 p.m. UTC 
The introduction of sstate and recipe specific sysroots made the configure
prepends obsolete and unneeded. The compile prepend has been there for over
a decade and is also likely obsolete. Remove the whole lot, we look into any
issues that arise.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-devtools/libtool/libtool-2.5.0.inc          | 7 -------
 meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb     | 7 -------
 meta/recipes-devtools/libtool/libtool-native_2.5.0.bb    | 7 -------
 meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb | 7 -------
 4 files changed, 28 deletions(-)
diff mbox series

Patch

diff --git a/meta/recipes-devtools/libtool/libtool-2.5.0.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc
index a609de6369b..e0c9aae387a 100644
--- a/meta/recipes-devtools/libtool/libtool-2.5.0.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.5.0.inc
@@ -24,13 +24,6 @@  SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \
 
 SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23"
 
-do_compile:prepend () {
-	# Sometimes this file doesn't get rebuilt, force the issue
-	rm -f ${S}/build-aux/ltmain.sh
-	make build-aux/ltmain.sh
-	./config.status
-}
-
 inherit autotools texinfo
 EXTRA_AUTORECONF = "--exclude=libtoolize"
 
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb
index 93f1dd7825d..18849cb8ef6 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb
@@ -7,13 +7,6 @@  datadir = "${STAGING_DIR_TARGET}${target_datadir}"
 
 inherit nopackages
 
-do_configure:prepend () {
-	# Remove any existing libtool m4 since old stale versions would break
-	# any upgrade
-	rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
-	rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
-}
-
 #
 # ccache may or may not be INHERITED, we remove references to it so the sstate
 # artefact works on a machine where its not present. libtool-cross isn't used
diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb
index 92f4b463032..be96b52dd66 100644
--- a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb
+++ b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb
@@ -4,13 +4,6 @@  DEPENDS = ""
 
 inherit native
 
-do_configure:prepend () {
-	# Remove any existing libtool m4 since old stale versions would break
-	# any upgrade
-	rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
-	rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
-}
-
 do_install () {
 	autotools_do_install
 	install -d ${D}${bindir}/
diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb
index 86c55ded7b6..ddb60e717ca 100644
--- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb
+++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb
@@ -9,13 +9,6 @@  inherit nativesdk
 S = "${WORKDIR}/libtool-${PV}"
 FILES:${PN} += "${datadir}/libtool/*"
 
-do_configure:prepend () {
-	# Remove any existing libtool m4 since old stale versions would break
-	# any upgrade
-	rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
-	rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
-}
-
 do_install () {
 	autotools_do_install
 	install -d ${D}${bindir}/