Switch from an alpha to a beta release. Drop two patches merged upstream.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> --- .../{libtool-2.5.0.inc => libtool-2.5.1.inc} | 6 +--- ...-cross_2.5.0.bb => libtool-cross_2.5.1.bb} | 0 ...ative_2.5.0.bb => libtool-native_2.5.1.bb} | 0 ...-Add-missing-sysroot-to-library-path.patch | 26 ---------------- .../libtool/libtool/filefix.patch | 30 ------------------- .../{libtool_2.5.0.bb => libtool_2.5.1.bb} | 0 ...ol_2.5.0.bb => nativesdk-libtool_2.5.1.bb} | 0 7 files changed, 1 insertion(+), 61 deletions(-) rename meta/recipes-devtools/libtool/{libtool-2.5.0.inc => libtool-2.5.1.inc} (87%) rename meta/recipes-devtools/libtool/{libtool-cross_2.5.0.bb => libtool-cross_2.5.1.bb} (100%) rename meta/recipes-devtools/libtool/{libtool-native_2.5.0.bb => libtool-native_2.5.1.bb} (100%) delete mode 100644 meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch delete mode 100644 meta/recipes-devtools/libtool/libtool/filefix.patch rename meta/recipes-devtools/libtool/{libtool_2.5.0.bb => libtool_2.5.1.bb} (100%) rename meta/recipes-devtools/libtool/{nativesdk-libtool_2.5.0.bb => nativesdk-libtool_2.5.1.bb} (100%) diff --git a/meta/recipes-devtools/libtool/libtool-2.5.0.inc b/meta/recipes-devtools/libtool/libtool-2.5.1.inc similarity index 87% rename from meta/recipes-devtools/libtool/libtool-2.5.0.inc rename to meta/recipes-devtools/libtool/libtool-2.5.1.inc index e0c9aae387a..94344d4d416 100644 --- a/meta/recipes-devtools/libtool/libtool-2.5.0.inc +++ b/meta/recipes-devtools/libtool/libtool-2.5.1.inc @@ -10,19 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \ file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \ - file://0003-ltmain.in-Add-missing-sysroot-to-library-path.patch \ file://0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \ file://0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \ file://dont-depend-on-help2man.patch \ file://0006-libtool.m4-Handle-as-a-sysroot-correctly.patch \ file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ file://nohardcodepaths.patch \ - file://filefix.patch \ " - - -SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23" +SRC_URI[sha256sum] = "6a83edafd42d4e2ebdc09579f99ce828d5f932f1738de02495cc8c2884e430ce" 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.1.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb rename to meta/recipes-devtools/libtool/libtool-cross_2.5.1.bb diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.1.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool-native_2.5.0.bb rename to meta/recipes-devtools/libtool/libtool-native_2.5.1.bb diff --git a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch b/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch deleted file mode 100644 index 2436f68a49a..00000000000 --- a/meta/recipes-devtools/libtool/libtool/0003-ltmain.in-Add-missing-sysroot-to-library-path.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Khem Raj <raj.k...@gmail.com> -Subject: [PATCH 03/12] ltmain.in: Add missing sysroot to library path - -When using a sysroot we should append it to libdir, which is helpful in -cross builds as the system is staged in the sysroot. For normal builds, -i.e. when lt_sysroot is not set, it will still behave the same and add --L/usr/lib to the relink command. - -Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> - -Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=3221f9f0fb98d5740ab5d0e8db6a731302520644] - -Index: libtool-2.5.0/build-aux/ltmain.in -=================================================================== ---- libtool-2.5.0.orig/build-aux/ltmain.in -+++ libtool-2.5.0/build-aux/ltmain.in -@@ -6514,7 +6514,7 @@ func_mode_link () - fi - else - # We cannot seem to hardcode it, guess we'll fake it. -- add_dir=-L$libdir -+ add_dir="-L$lt_sysroot$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case $libdir in diff --git a/meta/recipes-devtools/libtool/libtool/filefix.patch b/meta/recipes-devtools/libtool/libtool/filefix.patch deleted file mode 100644 index 4d851329549..00000000000 --- a/meta/recipes-devtools/libtool/libtool/filefix.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH] libtool.m4: Fix AC_CHECK_PROG usage - -In commit: - -https://git.savannah.gnu.org/cgit/libtool.git/commit/m4/libtool.m4?id=64bef5ba65f6820cd5f88e5249324b4f5955ee25 - -AC_CHECK_TOOL was changed to AC_CHECK_PROG however the arguments are -different and this result is a value of ":". Change this to match the -original intent. - -The lack of FILECMD was causing failures for mips64 builds as -m elf was -being passed to LD which isn't supported on our targets. - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-06/msg00000.html] - -Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> - -Index: libtool-2.5.0/m4/libtool.m4 -=================================================================== ---- libtool-2.5.0.orig/m4/libtool.m4 -+++ libtool-2.5.0/m4/libtool.m4 -@@ -8216,7 +8216,7 @@ AC_SUBST([DLLTOOL]) - # ---------------- - # Check for a file(cmd) program that can be used to detect file type and magic - m4_defun([_LT_DECL_FILECMD], --[AC_CHECK_PROG([FILECMD], [file], [:]) -+[AC_CHECK_PROG([FILECMD], [file], [file], [:]) - _LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) - ])# _LD_DECL_FILECMD - diff --git a/meta/recipes-devtools/libtool/libtool_2.5.0.bb b/meta/recipes-devtools/libtool/libtool_2.5.1.bb similarity index 100% rename from meta/recipes-devtools/libtool/libtool_2.5.0.bb rename to meta/recipes-devtools/libtool/libtool_2.5.1.bb diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.1.bb similarity index 100% rename from meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb rename to meta/recipes-devtools/libtool/nativesdk-libtool_2.5.1.bb
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#202896): https://lists.openembedded.org/g/openembedded-core/message/202896 Mute This Topic: https://lists.openembedded.org/mt/107682407/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-