libtool: 2.5.4 -> 2.6.2

Drop one patch applied upstream, refresh another.
Switch to xz compressed source tarball.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/libtool/libtool-2.5.4.inc b/meta/recipes-devtools/libtool/libtool-2.6.2.inc
similarity index 85%
rename from meta/recipes-devtools/libtool/libtool-2.5.4.inc
rename to meta/recipes-devtools/libtool/libtool-2.6.2.inc
index c646ed33d64543cf0abab6b12ce688f8dcf001c6..98bef38ae0b9fc5501aff256241adb4033107d00 100644 (file)
--- a/meta/recipes-devtools/libtool/libtool-2.5.4.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.6.2.inc
@@ -8,17 +8,16 @@ LICENSE = "GPL-2.0-only AND LGPL-2.1-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \
     file://libltdl/COPYING.LIB;md5=4bf661c1e3793e55c8d1051bc5e0ae21 "
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=570a9b3749dd0463a1778803b12a6dce \
     file://libltdl/COPYING.LIB;md5=4bf661c1e3793e55c8d1051bc5e0ae21 "
 

-SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
+SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.xz \

            file://0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \
            file://0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \
            file://0003-libtool-remove-help2man-dependency.patch \
            file://0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch \
            file://0001-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch \
            file://0002-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch \
            file://0003-libtool-remove-help2man-dependency.patch \
            file://0004-libtool.m4-Change-libtool-to-handle-sysroots-by-defa.patch \

-           file://0005-libtool-Check-for-static-libs-for-internal-compiler-.patch \

            file://0006-libtool-Fix-tools-path-issues.patch \
            file://0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch \
           "
 
            file://0006-libtool-Fix-tools-path-issues.patch \
            file://0007-libtool-Fix-problem-with-libtoolize-in-multilib.patch \
           "
 

-SRC_URI[sha256sum] = "da8ebb2ce4dcf46b90098daf962cffa68f4b4f62ea60f798d0ef12929ede6adf"
+SRC_URI[sha256sum] = "2ef1067c16c97db930fd740cc9bc3d3ba9a583804ae5ac42cc3e8719e49e191e"

 
 inherit autotools texinfo
 EXTRA_AUTORECONF = "--exclude=libtoolize"
 
 inherit autotools texinfo
 EXTRA_AUTORECONF = "--exclude=libtoolize"

diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.5.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.6.2.bb
similarity index 100%
rename from meta/recipes-devtools/libtool/libtool-cross_2.5.4.bb
rename to meta/recipes-devtools/libtool/libtool-cross_2.6.2.bb

diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.4.bb b/meta/recipes-devtools/libtool/libtool-native_2.6.2.bb
similarity index 100%
rename from meta/recipes-devtools/libtool/libtool-native_2.5.4.bb
rename to meta/recipes-devtools/libtool/libtool-native_2.6.2.bb

diff --git a/meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch b/meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch
index b174827eef74e57b5c87b1a3f45b43a9b8ebd9ae..c04c50fc75c1bb6d7159dd0a843366f5a66c6cb8 100644 (file)
--- a/meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch
+++ b/meta/recipes-devtools/libtool/libtool/0003-libtool-remove-help2man-dependency.patch
@@ -11,15 +11,15 @@ Updated by: Robert Yang <liezhi.yang@windriver.com>
  Makefile.am | 17 -----------------
  1 file changed, 17 deletions(-)
 
  Makefile.am | 17 -----------------
  1 file changed, 17 deletions(-)
 

-diff --git a/Makefile.am b/Makefile.am
-index 51c1fbdb..4962c3ad 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -408,23 +408,6 @@ $(notes_txt): $(notes_texi)
+Index: libtool-2.6.2/Makefile.am
+===================================================================
+--- libtool-2.6.2.orig/Makefile.am
++++ libtool-2.6.2/Makefile.am
+@@ -419,25 +419,6 @@ $(notes_txt): $(notes_texi)

        $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \
            $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'
  
        $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \
            $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)'
  

--dist_man1_MANS                = $(libtool_1) $(libtoolize_1)
+-dist_man1_MANS                = $(libtool_1) $(libtoolize_1) $(libtoolnextv_1)

 -MAINTAINERCLEANFILES  += $(dist_man1_MANS)
 -update_mans = \
 -  PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \
 -MAINTAINERCLEANFILES  += $(dist_man1_MANS)
 -update_mans = \
 -  PATH=".$(PATH_SEPARATOR)$$PATH"; export PATH; \


@@ -33,12 +33,11 @@ index 51c1fbdb..4962c3ad 100644
 -      $(AM_V_GEN)$(update_mans) -n 'Provide generalized library-building support services' --help-option=--help-all libtool
 -$(libtoolize_1): $(libtoolize_in)
 -      $(AM_V_GEN)$(update_mans) -n 'Prepare a package to use libtool' libtoolize
 -      $(AM_V_GEN)$(update_mans) -n 'Provide generalized library-building support services' --help-option=--help-all libtool
 -$(libtoolize_1): $(libtoolize_in)
 -      $(AM_V_GEN)$(update_mans) -n 'Prepare a package to use libtool' libtoolize

+-$(libtoolnextv_1): $(libtoolnextv_in)
+-      $(AM_V_GEN)$(update_mans) -n 'Determines next version to use for a libtool library' libtool-next-version

 -
 -
 -
  ## ------------- ##
  ## Installation. ##
  ## ------------- ##
 -
 -
 -
  ## ------------- ##
  ## Installation. ##
  ## ------------- ##

--- 
-2.39.5
-

diff --git a/meta/recipes-devtools/libtool/libtool/0005-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0005-libtool-Check-for-static-libs-for-internal-compiler-.patch
deleted file mode 100644 (file)
index 5a4411c..0000000
--- a/meta/recipes-devtools/libtool/libtool/0005-libtool-Check-for-static-libs-for-internal-compiler-.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 9f16cd0624641e489665415150792d9054af8a7a Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 26 Nov 2024 09:57:39 +0000
-Subject: [PATCH 5/7] libtool: Check for static libs for internal compiler
- libraries
-
-Libtool checks only for libraries linked as -l* when trying to
-find internal compiler libraries. Clang, however uses the absolute
-path to link its internal libraries e.g. compiler_rt. This patch
-handles clang's statically linked libraries when finding internal
-compiler libraries.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-
-https://crbug.com/749263
-https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866
-
-Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html]
----
- m4/libtool.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/m4/libtool.m4 b/m4/libtool.m4
-index 3650c87c..51493a10 100644
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -7708,7 +7708,7 @@ if AC_TRY_EVAL(ac_compile); then
-   for p in `eval "$output_verbose_link_cmd"`; do
-     case $prev$p in
- 
--    -L* | -R* | -l*)
-+    -L* | -R* | -l* | */libclang_rt.*.a)
-        # Some compilers place space between "-{L,R,l}" and the path.
-        # Remove the space.
-        if test x-L = x"$p" ||
--- 
-2.39.5
-

diff --git a/meta/recipes-devtools/libtool/libtool_2.5.4.bb b/meta/recipes-devtools/libtool/libtool_2.6.2.bb
similarity index 100%
rename from meta/recipes-devtools/libtool/libtool_2.5.4.bb
rename to meta/recipes-devtools/libtool/libtool_2.6.2.bb

diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.6.2.bb
similarity index 100%
rename from meta/recipes-devtools/libtool/nativesdk-libtool_2.5.4.bb
rename to meta/recipes-devtools/libtool/nativesdk-libtool_2.6.2.bb