diff options
Diffstat (limited to 'meta/recipes-devtools/libtool')
21 files changed, 97 insertions, 502 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.7.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc index a07df720ac..e0c9aae387 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.7.inc +++ b/meta/recipes-devtools/libtool/libtool-2.5.0.inc @@ -8,32 +8,21 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://libltdl/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c " -SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \ +SRC_URI = "https://alpha.gnu.org/gnu/libtool/libtool-${PV}.tar.gz \ file://0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch \ - file://0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.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://nohardcodepaths.patch \ - file://0007-libtool-Fix-support-for-NIOS2-processor.patch \ file://0008-libtool-Check-for-static-libs-for-internal-compiler-.patch \ - file://0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch \ - file://0010-Makefile.am-make-sure-autoheader-run-before-automake.patch \ - file://0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch \ - file://0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch \ - file://0001-ltmain.in-Parse-additional-clang-options.patch \ + file://nohardcodepaths.patch \ + file://filefix.patch \ " -SRC_URI[sha256sum] = "04e96c2404ea70c590c546eba4202a4e12722c640016c12b9b2f1ce3d481e9a8" -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 -} + +SRC_URI[sha256sum] = "d438c317455d85554ce2f998be48866fd40cfcbf834d60b3026f4fc0ed583d23" inherit autotools texinfo EXTRA_AUTORECONF = "--exclude=libtoolize" diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb index 93f1dd7825..18849cb8ef 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.7.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.4.7.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb deleted file mode 100644 index 19024f7830..0000000000 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.7.bb +++ /dev/null @@ -1,20 +0,0 @@ -require libtool-${PV}.inc - -DEPENDS = "" - -inherit native - -EXTRA_OECONF = " --with-libtool-sysroot=${STAGING_DIR_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}/ - install -m 0755 libtool ${D}${bindir}/libtool -} diff --git a/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb new file mode 100644 index 0000000000..be96b52dd6 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-native_2.5.0.bb @@ -0,0 +1,11 @@ +require libtool-${PV}.inc + +DEPENDS = "" + +inherit native + +do_install () { + autotools_do_install + install -d ${D}${bindir}/ + install -m 0755 libtool ${D}${bindir}/libtool +} diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch index 4c4d0547a3..d5d906e6b6 100644 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch +++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Handle-trailing-slashes-on-install-command.patch @@ -14,11 +14,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00010.html] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 96b37003..3d5dcd0a 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -2378,8 +2378,14 @@ func_mode_install () +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 +@@ -2382,8 +2382,14 @@ func_mode_install () func_append dir "$objdir" if test -n "$relink_command"; then @@ -34,6 +34,3 @@ index 96b37003..3d5dcd0a 100644 # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch deleted file mode 100644 index 0285c143d2..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Khem Raj <raj.khem@gmail.com> -Subject: [PATCH] ltmain.in: Parse additional clang options - -clang uses -rtlib and --unwindlib to select proper compiler runtime in -some cases. There fore pass these options to linker when found in -ldflags - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: libtool-2.4.7/build-aux/ltmain.in -=================================================================== ---- libtool-2.4.7.orig/build-aux/ltmain.in -+++ libtool-2.4.7/build-aux/ltmain.in -@@ -5420,10 +5420,12 @@ func_mode_link () - # -fsanitize=* Clang/GCC memory and address sanitizer - # -fuse-ld=* Linker select flags for GCC - # -f*-prefix-map* needed for lto linking -+ # -rtlib=* select c runtime lib with clang -+ # --unwindlib=* select unwinder library with clang - # -Wa,* Pass flags directly to the assembler - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-rtlib=*|--unwindlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-f*-prefix-map*|-Wa,*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result diff --git a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch b/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch deleted file mode 100644 index 1920e2e6db..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch +++ /dev/null @@ -1,169 +0,0 @@ -From: Khem Raj <raj.khem@gmail.com> -Subject: [PATCH 02/12] libtool.m4: Rename the --with-sysroot option to avoid conflict with gcc/binutils - -This patch renames the --with-sysroot option to --with-libtool-sysroot -to avoid namespace conflict with binutils, gcc and other toolchain -components since these componets also add that option to configure -and this becomes confusing and conflicting otherwise. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Upstream report: -http://lists.gnu.org/archive/html/libtool/2010-10/msg00048.html - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00014.html] - -Index: libtool-2.4.7/m4/libtool.m4 -=================================================================== ---- libtool-2.4.7.orig/m4/libtool.m4 -+++ libtool-2.4.7/m4/libtool.m4 -@@ -1244,28 +1244,28 @@ _LT_DECL([], [ECHO], [1], [An echo progr - AC_DEFUN([_LT_WITH_SYSROOT], - [m4_require([_LT_DECL_SED])dnl - AC_MSG_CHECKING([for sysroot]) --AC_ARG_WITH([sysroot], --[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], -+AC_ARG_WITH([libtool-sysroot], -+[AS_HELP_STRING([--with-libtool-sysroot@<:@=DIR@:>@], - [Search for dependent libraries within DIR (or the compiler's sysroot - if not specified).])], --[], [with_sysroot=no]) -+[], [with_libtool_sysroot=no]) - - dnl lt_sysroot will always be passed unquoted. We quote it here - dnl in case the user passed a directory name. - lt_sysroot= --case $with_sysroot in #( -+case $with_libtool_sysroot in #( - yes) - if test yes = "$GCC"; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` - fi - ;; #( - /*) -- lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` -+ lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` - ;; #( - no|'') - ;; #( - *) -- AC_MSG_RESULT([$with_sysroot]) -+ AC_MSG_RESULT([$with_libtool_sysroot]) - AC_MSG_ERROR([The sysroot must be an absolute path.]) - ;; - esac -Index: libtool-2.4.7/tests/sysroot.at -=================================================================== ---- libtool-2.4.7.orig/tests/sysroot.at -+++ libtool-2.4.7/tests/sysroot.at -@@ -65,7 +65,7 @@ while read file; do - done]) - - LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" --configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" -+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" - - #??? - if test PATH = "$shlibpath_var"; then -@@ -115,7 +115,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_PROG_CC - AC_CONFIG_SRCDIR([lib2.c]) - LT_INIT --sysroot=$with_sysroot -+sysroot=$with_libtool_sysroot - AC_SUBST([sysroot]) - AC_OUTPUT(Makefile) - ]]) -@@ -156,7 +156,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_PROG_CC - AC_CONFIG_SRCDIR([prog.c]) - LT_INIT --sysroot=$with_sysroot -+sysroot=$with_libtool_sysroot - AC_SUBST([sysroot]) - AC_OUTPUT(Makefile) - ]]) -diff --git a/tests/testsuite b/tests/testsuite ---- a/tests/testsuite -+++ b/tests/testsuite -@@ -48945,7 +48945,7 @@ $at_traceon; } - - - LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" --configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" -+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" - - #??? - if test PATH = "$shlibpath_var"; then -@@ -49154,7 +49154,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_PROG_CC - AC_CONFIG_SRCDIR([lib2.c]) - LT_INIT --sysroot=$with_sysroot -+sysroot=$with_libtool_sysroot - AC_SUBST([sysroot]) - AC_OUTPUT(Makefile) - _ATEOF -@@ -49342,7 +49342,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_PROG_CC - AC_CONFIG_SRCDIR([prog.c]) - LT_INIT --sysroot=$with_sysroot -+sysroot=$with_libtool_sysroot - AC_SUBST([sysroot]) - AC_OUTPUT(Makefile) - _ATEOF -@@ -49694,7 +49694,7 @@ $at_traceon; } - - - LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" --configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" -+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" - - #??? - if test PATH = "$shlibpath_var"; then -@@ -49903,7 +49903,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_PROG_CC - AC_CONFIG_SRCDIR([lib2.c]) - LT_INIT --sysroot=$with_sysroot -+sysroot=$with_libtool_sysroot - AC_SUBST([sysroot]) - AC_OUTPUT(Makefile) - _ATEOF -@@ -50091,7 +50091,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_PROG_CC - AC_CONFIG_SRCDIR([prog.c]) - LT_INIT --sysroot=$with_sysroot -+sysroot=$with_libtool_sysroot - AC_SUBST([sysroot]) - AC_OUTPUT(Makefile) - _ATEOF -@@ -50443,7 +50443,7 @@ $at_traceon; } - - - LDFLAGS="$LDFLAGS --sysroot=$sysroot -no-undefined" --configure_options="$configure_options --with-sysroot=$sysroot --prefix=$prefix" -+configure_options="$configure_options --with-libtool-sysroot=$sysroot --prefix=$prefix" - - #??? - if test PATH = "$shlibpath_var"; then -@@ -50652,7 +50652,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_PROG_CC - AC_CONFIG_SRCDIR([lib2.c]) - LT_INIT --sysroot=$with_sysroot -+sysroot=$with_libtool_sysroot - AC_SUBST([sysroot]) - AC_OUTPUT(Makefile) - _ATEOF -@@ -50840,7 +50840,7 @@ AM_INIT_AUTOMAKE([foreign]) - AC_PROG_CC - AC_CONFIG_SRCDIR([prog.c]) - LT_INIT --sysroot=$with_sysroot -+sysroot=$with_libtool_sysroot - AC_SUBST([sysroot]) - AC_OUTPUT(Makefile) - _ATEOF 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 index 07c7f911e0..2436f68a49 100644 --- 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 @@ -8,13 +8,14 @@ i.e. when lt_sysroot is not set, it will still behave the same and add Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00017.html] +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] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 3d5dcd0a..2c994612 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -6475,7 +6475,7 @@ func_mode_link () +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. @@ -23,6 +24,3 @@ index 3d5dcd0a..2c994612 100644 # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch index 4fcf456b0b..a6b3313d71 100644 --- a/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch +++ b/meta/recipes-devtools/libtool/libtool/0004-ltmain.sh-Fix-sysroot-paths-being-encoded-into-RPATH.patch @@ -9,11 +9,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00009.html] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 2c994612..96238350 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -7654,9 +7654,11 @@ EOF +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 +@@ -7584,9 +7584,11 @@ func_mode_link () test relink = "$opt_mode" || rpath=$compile_rpath$rpath for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -27,7 +27,7 @@ index 2c994612..96238350 100644 if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir else -@@ -8386,6 +8388,10 @@ EOF +@@ -8316,6 +8318,10 @@ func_mode_link () hardcode_libdirs= for libdir in $compile_rpath $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -38,7 +38,7 @@ index 2c994612..96238350 100644 if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir -@@ -8437,6 +8443,10 @@ EOF +@@ -8367,6 +8373,10 @@ func_mode_link () hardcode_libdirs= for libdir in $finalize_rpath; do if test -n "$hardcode_libdir_flag_spec"; then @@ -49,6 +49,3 @@ index 2c994612..96238350 100644 if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch index 589a33e8a6..54e602f118 100644 --- a/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch +++ b/meta/recipes-devtools/libtool/libtool/0005-ltmain.in-Don-t-encode-RATHS-which-match-default-lin.patch @@ -12,11 +12,11 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00013.html] -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 96238350..6fb58ed2 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -7672,8 +7672,16 @@ EOF +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 +@@ -7602,8 +7602,16 @@ func_mode_link () esac fi else @@ -35,7 +35,7 @@ index 96238350..6fb58ed2 100644 fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8406,8 +8414,16 @@ EOF +@@ -8336,8 +8344,16 @@ func_mode_link () esac fi else @@ -54,7 +54,7 @@ index 96238350..6fb58ed2 100644 fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8461,8 +8477,14 @@ EOF +@@ -8391,8 +8407,14 @@ func_mode_link () esac fi else @@ -71,6 +71,3 @@ index 96238350..6fb58ed2 100644 fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch index a221dab528..feb1048b55 100644 --- a/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch +++ b/meta/recipes-devtools/libtool/libtool/0006-libtool.m4-Handle-as-a-sysroot-correctly.patch @@ -1,43 +1,38 @@ -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Subject: [PATCH 06/12] libtool.m4: Handle "/" as a sysroot correctly +libtool.m4: Change libtool to handle sysroots by default -Update libtool.m4 to resolve a problem with lt_sysroot not being properly -updated if the option '--with[-libtool]-sysroot' is not provided when -running the 'configure' script for a package so that "/" as a sysroot -is handled correctly by libtool. +Rather than using no sysroot by default, always query gcc to obtain the sysroot. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Upstream Report: -http://lists.gnu.org/archive/html/bug-libtool/2013-09/msg00005.html +Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of default] -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00018.html] +--- + m4/libtool.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) -Index: libtool-2.4.7/m4/libtool.m4 +Index: libtool-2.5.0/m4/libtool.m4 =================================================================== ---- libtool-2.4.7.orig/m4/libtool.m4 -+++ libtool-2.4.7/m4/libtool.m4 -@@ -1254,16 +1254,20 @@ dnl lt_sysroot will always be passed unq +--- libtool-2.5.0.orig/m4/libtool.m4 ++++ libtool-2.5.0/m4/libtool.m4 +@@ -1253,18 +1253,18 @@ dnl lt_sysroot will always be passed unq dnl in case the user passed a directory name. lt_sysroot= - case $with_libtool_sysroot in #( + case $with_sysroot in #( - yes) + no) if test yes = "$GCC"; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` -+ # Treat "/" the same a an unset sysroot. -+ if test "$lt_sysroot" = /; then -+ lt_sysroot= -+ fi + # Trim trailing / since we'll always append absolute paths and we want + # to avoid //, if only for less confusing output for the user. + lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'` fi ;; #( + yes|''|/) + ;; #( /*) - lt_sysroot=`echo "$with_libtool_sysroot" | $SED -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( - no|'') - ;; #( *) - AC_MSG_RESULT([$with_libtool_sysroot]) + AC_MSG_RESULT([$with_sysroot]) AC_MSG_ERROR([The sysroot must be an absolute path.]) diff --git a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch b/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch deleted file mode 100644 index 277afe0af6..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Marek Vasut <marex@denx.de> -Subject: [PATCH 07/12] libtool: Fix support for NIOS2 processor - -The name of the system contains the string "nios2". This string -is caught by the some of the greedy checks for OS/2 in libtool, -in particular the *os2* branches of switch statements match for -the nios2 string, which results in incorrect behavior of libtool. - -This patch adds an explicit check for *nios2* before the *os2* -checks to prevent the OS/2 check incorrectly trapping the nios2 -as well. - -Signed-off-by: Marek Vasut <marex@denx.de> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00021.html] - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 6fb58ed2..606f17be 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -519,6 +519,12 @@ libtool_validate_options () - test : = "$debug_cmd" || func_append preserve_args " --debug" - - case $host in -+ # For NIOS2, we want to make sure that it's not caught by the -+ # more general OS/2 check below. Otherwise, NIOS2 is the same -+ # as the default option. -+ *nios2*) -+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps -+ ;; - # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452 - # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788 - *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*) -@@ -6246,6 +6252,15 @@ func_mode_link () - if test -n "$library_names" && - { test no = "$use_static_libs" || test -z "$old_library"; }; then - case $host in -+ *nios2*) -+ # For NIOS2, we want to make sure that it's not caught by the -+ # more general OS/2 check below. Otherwise, NIOS2 is the same -+ # as the default option. -+ if test no = "$installed"; then -+ func_append notinst_deplibs " $lib" -+ need_relink=yes -+ fi -+ ;; - *cygwin* | *mingw* | *cegcc* | *os2*) - # No point in relinking DLLs because paths are not encoded - func_append notinst_deplibs " $lib" -@@ -6316,6 +6331,11 @@ func_mode_link () - elif test -n "$soname_spec"; then - # bleh windows - case $host in -+ *nios2*) -+ # For NIOS2, we want to make sure that it's not caught by the -+ # more general OS/2 check below. Otherwise, NIOS2 is the same -+ # as the default option. -+ ;; - *cygwin* | mingw* | *cegcc* | *os2*) - func_arith $current - $age - major=$func_arith_result --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch index 83c74373ae..c103ebb7bf 100644 --- a/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch +++ b/meta/recipes-devtools/libtool/libtool/0008-libtool-Check-for-static-libs-for-internal-compiler-.patch @@ -15,19 +15,16 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=27866 Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00016.html] -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index 180dd9d1..022c1292 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -7560,7 +7560,7 @@ if AC_TRY_EVAL(ac_compile); then +Index: libtool-2.5.0/m4/libtool.m4 +=================================================================== +--- libtool-2.5.0.orig/m4/libtool.m4 ++++ libtool-2.5.0/m4/libtool.m4 +@@ -7553,7 +7553,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}" and the path. + # Some compilers place space between "-{L,R,l}" and the path. # Remove the space. - if test x-L = "$p" || --- -2.25.1 - + if test x-L = x"$p" || diff --git a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch b/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch deleted file mode 100644 index 437c09fa6d..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Mingli Yu <mingli.yu@windriver.com> -Subject: [PATCH 09/12] Makefile.am: make sure autoheader run before autoconf - -autoheader will update ../libtool-2.4.6/libltdl/config-h.in which -autoconf needs, so there comes a race sometimes as below: - | configure.ac:45: error: required file 'config-h.in' not found - | touch '../libtool-2.4.6/libltdl/config-h.in' - -So make sure autoheader run before autoconf to avoid this race. - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00015.html] - -diff --git a/Makefile.am b/Makefile.am -index 6b546092..84795d87 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -370,7 +370,7 @@ lt_configure_deps = $(lt_aclocal_m4) $(lt_aclocal_m4_deps) - $(lt_aclocal_m4): $(lt_aclocal_m4_deps) - $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(ACLOCAL) -I ../m4 - --$(lt_configure): $(lt_configure_deps) -+$(lt_configure): $(lt_configure_deps) $(lt_config_h_in) - $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOCONF) - - $(lt_config_h_in): $(lt_configure_deps) --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch b/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch deleted file mode 100644 index a92e22905f..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Mingli Yu <mingli.yu@windriver.com> -Subject: [PATCH 10/12] Makefile.am: make sure autoheader run before automake - -When use automake to generate Makefile.in from Makefile.am, there -comes below race: - | configure.ac:45: error: required file 'config-h.in' not found - -It is because the file config-h.in in updating process by autoheader, -so make automake run after autoheader to avoid the above race. - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00020.html] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> - -diff --git a/Makefile.am b/Makefile.am -index 84795d87..8c9949ed 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -333,7 +333,7 @@ EXTRA_DIST += $(lt_aclocal_m4) \ - $(lt_obsolete_m4) \ - $(stamp_mk) - --$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) -+$(lt_Makefile_in): $(lt_Makefile_am) $(lt_aclocal_m4) $(lt_config_h_in) - $(AM_V_GEN)cd '$(srcdir)/$(ltdl_dir)' && $(AUTOMAKE) Makefile - - # Don't let unused scripts leak into the libltdl Makefile --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch b/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch deleted file mode 100644 index 4945533bad..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Subject: [PATCH 11/12] ltmain.in: Handle prefix-map compiler options correctly - -If lto is enabled, we need the prefix-map variables to be passed to the linker. -Add these to the list of options libtool passes through. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html] - -Index: libtool-2.4.7/build-aux/ltmain.in -=================================================================== ---- libtool-2.4.7.orig/build-aux/ltmain.in -+++ libtool-2.4.7/build-aux/ltmain.in -@@ -5419,11 +5419,12 @@ func_mode_link () - # -stdlib=* select c++ std lib with clang - # -fsanitize=* Clang/GCC memory and address sanitizer - # -fuse-ld=* Linker select flags for GCC -+ # -f*-prefix-map* needed for lto linking - # -Wa,* Pass flags directly to the assembler - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ -- -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) -+ -specs=*|-fsanitize=*|-fuse-ld=*|-f*-prefix-map*|-Wa,*) - func_quote_arg pretty "$arg" - arg=$func_quote_arg_result - func_append compile_command " $arg" diff --git a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch b/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch deleted file mode 100644 index c750303d43..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Subject: [PATCH 12/12] libtool.m4: For reproducibility stop encoding hostname in libtool script - -For reproducibilty, stop encoding the hostname into the libtool script, this isn't -really adding much to debugging and most distros are carrying such a patch now as -reproducibility is important. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -https://sources.debian.org/data/main/libt/libtool/2.4.6-10/debian/patches/ - no_hostname.patch - -Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00011.html] - -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index 022c1292..1a8a2998 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -728,7 +728,6 @@ _LT_CONFIG_SAVE_COMMANDS([ - cat <<_LT_EOF >> "$cfgfile" - #! $SHELL - # Generated automatically by $as_me ($PACKAGE) $VERSION --# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - # NOTE: Changes made to this file will be lost: look at ltmain.sh. - - # Provide generalized library-building support services. --- -2.25.1 - diff --git a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch index fd4084c859..0013d16544 100644 --- a/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch +++ b/meta/recipes-devtools/libtool/libtool/dont-depend-on-help2man.patch @@ -4,9 +4,10 @@ Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Updated by: Robert Yang <liezhi.yang@windriver.com> diff --git a/Makefile.am b/Makefile.am +index 7bd7f72..c29860e 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -404,21 +404,6 @@ $(notes_txt): $(notes_texi) +@@ -411,21 +411,6 @@ $(notes_txt): $(notes_texi) $(AM_V_GEN)$(MAKEINFO) -P '$(srcdir)/doc' --no-headers \ $(MAKEINFOFLAGS) -o '$@' '$(notes_texi)' diff --git a/meta/recipes-devtools/libtool/libtool/filefix.patch b/meta/recipes-devtools/libtool/libtool/filefix.patch new file mode 100644 index 0000000000..4d85132954 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool/filefix.patch @@ -0,0 +1,30 @@ +[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.purdie@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.4.7.bb b/meta/recipes-devtools/libtool/libtool_2.5.0.bb index 44a4950574..44a4950574 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.7.bb +++ b/meta/recipes-devtools/libtool/libtool_2.5.0.bb diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb index 86c55ded7b..ddb60e717c 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.7.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}/ |