diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-06-03 14:35:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-06-04 12:04:52 +0100 |
commit | 06af1bdc300ed6bb382dbf809ef70f86bbeedc98 (patch) | |
tree | 62c8e8b7115b18ff3b340a11bcb40bdf6c8c8ae1 | |
parent | f2a5850a80533730ac8b30399b6bb15a5683fc29 (diff) | |
download | poky-06af1bdc300ed6bb382dbf809ef70f86bbeedc98.tar.gz |
libtool: Drop obsolete configure/compile prepends
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.
(From OE-Core rev: d6a22998e47bcceee3fc3edc72eb2df2970dabfa)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
4 files changed, 0 insertions, 28 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.5.0.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc index a609de6369..e0c9aae387 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 \ | |||
24 | 24 | ||
25 | SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23" | 25 | SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23" |
26 | 26 | ||
27 | do_compile:prepend () { | ||
28 | # Sometimes this file doesn't get rebuilt, force the issue | ||
29 | rm -f ${S}/build-aux/ltmain.sh | ||
30 | make build-aux/ltmain.sh | ||
31 | ./config.status | ||
32 | } | ||
33 | |||
34 | inherit autotools texinfo | 27 | inherit autotools texinfo |
35 | EXTRA_AUTORECONF = "--exclude=libtoolize" | 28 | EXTRA_AUTORECONF = "--exclude=libtoolize" |
36 | 29 | ||
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 93f1dd7825..18849cb8ef 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}" | |||
7 | 7 | ||
8 | inherit nopackages | 8 | inherit nopackages |
9 | 9 | ||
10 | do_configure:prepend () { | ||
11 | # Remove any existing libtool m4 since old stale versions would break | ||
12 | # any upgrade | ||
13 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | ||
14 | rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 | ||
15 | } | ||
16 | |||
17 | # | 10 | # |
18 | # ccache may or may not be INHERITED, we remove references to it so the sstate | 11 | # ccache may or may not be INHERITED, we remove references to it so the sstate |
19 | # artefact works on a machine where its not present. libtool-cross isn't used | 12 | # 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 92f4b46303..be96b52dd6 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 = "" | |||
4 | 4 | ||
5 | inherit native | 5 | inherit native |
6 | 6 | ||
7 | do_configure:prepend () { | ||
8 | # Remove any existing libtool m4 since old stale versions would break | ||
9 | # any upgrade | ||
10 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | ||
11 | rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 | ||
12 | } | ||
13 | |||
14 | do_install () { | 7 | do_install () { |
15 | autotools_do_install | 8 | autotools_do_install |
16 | install -d ${D}${bindir}/ | 9 | 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 86c55ded7b..ddb60e717c 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 | |||
9 | S = "${WORKDIR}/libtool-${PV}" | 9 | S = "${WORKDIR}/libtool-${PV}" |
10 | FILES:${PN} += "${datadir}/libtool/*" | 10 | FILES:${PN} += "${datadir}/libtool/*" |
11 | 11 | ||
12 | do_configure:prepend () { | ||
13 | # Remove any existing libtool m4 since old stale versions would break | ||
14 | # any upgrade | ||
15 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | ||
16 | rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 | ||
17 | } | ||
18 | |||
19 | do_install () { | 12 | do_install () { |
20 | autotools_do_install | 13 | autotools_do_install |
21 | install -d ${D}${bindir}/ | 14 | install -d ${D}${bindir}/ |