diff options
Diffstat (limited to 'meta/recipes-devtools/libtool')
24 files changed, 111 insertions, 976 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.6.inc b/meta/recipes-devtools/libtool/libtool-2.5.0.inc index a636926ef9..e0c9aae387 100644 --- a/meta/recipes-devtools/libtool/libtool-2.4.6.inc +++ b/meta/recipes-devtools/libtool/libtool-2.5.0.inc @@ -4,39 +4,25 @@ Libtool hides the complexity of generating special library types \ (such as shared libraries) behind a consistent interface." HOMEPAGE = "http://www.gnu.org/software/libtool/libtool.html" SECTION = "devel" -LICENSE = "GPLv2 & LGPLv2.1" +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://unwind-opt-parsing.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://libool.m4-add-ARFLAGS-variable.patch \ - file://ARFLAGS-use-cr-instead-of-cru-by-default.patch \ + file://nohardcodepaths.patch \ + file://filefix.patch \ " -SRC_URI[md5sum] = "addf44b646ddb4e3919805aa88fa7c5e" -SRC_URI[sha256sum] = "e3bd4d5d3d025a36c21dd6af7ea818a2afcd4dfc1ea5a17b39d7854bcd0c06e3" -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.6.bb b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb index 4a43867b3e..18849cb8ef 100644 --- a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool-cross_2.5.0.bb @@ -1,20 +1,12 @@ require libtool-${PV}.inc PACKAGES = "" -SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch" 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 @@ -22,15 +14,16 @@ do_configure:prepend () { # Find references to LTCC="ccache xxx-gcc" and CC="ccache xxx-gcc" # do_install () { + ln -s false ${D} install -d ${D}${bindir_crossscripts}/ - install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool + install -m 0755 libtool ${D}${bindir_crossscripts}/libtool sed -e 's@^\(predep_objects="\).*@\1"@' \ -e 's@^\(postdep_objects="\).*@\1"@' \ -e 's@^CC="ccache.@CC="@' \ -e 's@^LTCC="ccache.@LTCC="@' \ - -i ${D}${bindir_crossscripts}/${HOST_SYS}-libtool - sed -i '/^archive_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/${HOST_SYS}-libtool - sed -i '/^archive_expsym_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/${HOST_SYS}-libtool + -i ${D}${bindir_crossscripts}/libtool + sed -i '/^archive_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/libtool + sed -i '/^archive_expsym_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/libtool GREP='/bin/grep' SED='sed' ${S}/build-aux/inline-source libtoolize > ${D}${bindir_crossscripts}/libtoolize chmod 0755 ${D}${bindir_crossscripts}/libtoolize install -d ${D}${target_datadir}/libtool/build-aux/ diff --git a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb b/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb deleted file mode 100644 index 3b20ce3e69..0000000000 --- a/meta/recipes-devtools/libtool/libtool-native_2.4.6.bb +++ /dev/null @@ -1,22 +0,0 @@ -require libtool-${PV}.inc - -DEPENDS = "" - -SRC_URI += "file://prefix.patch" - -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 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-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 eeb5ebf416..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,10 +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 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -2356,8 +2356,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 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 6da283959e..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0002-libtool.m4-Rename-the-with-sysroot-option-to-avoid-c.patch +++ /dev/null @@ -1,167 +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] - -diff --git a/m4/libtool.m4 b/m4/libtool.m4 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1215,28 +1215,28 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) - # ---------------- - AC_DEFUN([_LT_WITH_SYSROOT], - [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 -diff --git a/tests/sysroot.at b/tests/sysroot.at ---- a/tests/sysroot.at -+++ b/tests/sysroot.at -@@ -64,7 +64,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 -@@ -114,7 +114,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) - ]]) -@@ -155,7 +155,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 0103a00451..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,12 +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 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -6421,7 +6421,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. 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 21b3dfe306..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,24 +9,25 @@ 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 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -7569,9 +7569,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 -+ func_replace_sysroot "$libdir" -+ libdir=$func_replace_sysroot_result -+ func_stripname '=' '' "$libdir" -+ libdir=$func_stripname_result ++ func_replace_sysroot "$libdir" ++ libdir=$func_replace_sysroot_result ++ func_stripname '=' '' "$libdir" ++ libdir=$func_stripname_result if test -n "$hardcode_libdir_separator"; then - func_replace_sysroot "$libdir" - libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir else -@@ -8301,6 +8303,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 @@ -37,7 +38,7 @@ diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then hardcode_libdirs=$libdir -@@ -8352,6 +8358,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 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 50d47d9f7a..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,10 +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 -u b/build-aux/ltmain.in b/build-aux/ltmain.in ---- b/build-aux/ltmain.in -+++ b/build-aux/ltmain.in 2012-08-22 11:01:34.191345989 -0700 -@@ -7286,8 +7286,16 @@ +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 @@ -34,7 +35,7 @@ diff -u b/build-aux/ltmain.in b/build-aux/ltmain.in fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8019,8 +8027,16 @@ +@@ -8336,8 +8344,16 @@ func_mode_link () esac fi else @@ -53,7 +54,7 @@ diff -u b/build-aux/ltmain.in b/build-aux/ltmain.in fi elif test -n "$runpath_var"; then case "$perm_rpath " in -@@ -8070,8 +8086,14 @@ +@@ -8391,8 +8407,14 @@ func_mode_link () esac fi else 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 999971241f..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,44 +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: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00018.html] +Upstream-Status: Inappropriate [Upstream are unlikely to accept this change of default] --- -diff --git a/m4/libtool.m4 b/m4/libtool.m4 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1225,16 +1225,21 @@ dnl lt_sysroot will always be passed unquoted. We quote it here + m4/libtool.m4 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: libtool-2.5.0/m4/libtool.m4 +=================================================================== +--- 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. It seems to be more -+ # compatible across host platforms that way!? -+ 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 395464e908..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0007-libtool-Fix-support-for-NIOS2-processor.patch +++ /dev/null @@ -1,69 +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] - ---- - build-aux/ltmain.in | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index d5cf07a..4164284 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -504,6 +504,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*) -@@ -6220,6 +6226,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" -@@ -6290,6 +6305,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.5.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 afffdb9fd4..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 @@ -1,6 +1,4 @@ -From b9993338080325a6e2b2ec94ca0ece80e7fa3fb6 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Jan 2019 12:54:26 -0800 Subject: [PATCH 08/12] libtool: Check for static libs for internal compiler libraries Libtool checks only for libraries linked as -l* when trying to @@ -16,23 +14,17 @@ 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 d0389a0..9619c57 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -7536,7 +7536,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.20.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 348cd3c1ae..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0009-Makefile.am-make-sure-autoheader-run-before-autoconf.patch +++ /dev/null @@ -1,35 +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] - ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 4142c90..fe1a9fc 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -365,7 +365,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.29.2 - 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 cd963ef1be..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0010-Makefile.am-make-sure-autoheader-run-before-automake.patch +++ /dev/null @@ -1,36 +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> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 2752ecc..29950db 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -328,7 +328,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.29.2 - 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 b121a3c750..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch +++ /dev/null @@ -1,26 +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.6/build-aux/ltmain.in -=================================================================== ---- libtool-2.4.6.orig/build-aux/ltmain.in -+++ libtool-2.4.6/build-aux/ltmain.in -@@ -5424,9 +5424,10 @@ func_mode_link () - # --sysroot=* for sysroot support - # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - # -stdlib=* select c++ std lib with clang -+ # -f*-prefix-map* needed for lto linking - -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=*|-f*-prefix-map*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_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 64f911d46c..0000000000 --- a/meta/recipes-devtools/libtool/libtool/0012-libtool.m4-For-reproducibility-stop-encoding-hostnam.patch +++ /dev/null @@ -1,27 +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] - ---- -Index: libtool-2.4.6/m4/libtool.m4 -=================================================================== ---- libtool-2.4.6.orig/m4/libtool.m4 -+++ libtool-2.4.6/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. diff --git a/meta/recipes-devtools/libtool/libtool/ARFLAGS-use-cr-instead-of-cru-by-default.patch b/meta/recipes-devtools/libtool/libtool/ARFLAGS-use-cr-instead-of-cru-by-default.patch deleted file mode 100644 index 447640cef6..0000000000 --- a/meta/recipes-devtools/libtool/libtool/ARFLAGS-use-cr-instead-of-cru-by-default.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 418129bc63afc312701e84cb8afa5ca413df1ab5 Mon Sep 17 00:00:00 2001 -From: Pavel Raiskup <praiskup@redhat.com> -Date: Fri, 17 Apr 2015 16:54:58 +0200 -Subject: ARFLAGS: use 'cr' instead of 'cru' by default - -In some GNU/Linux distributions people started to compile 'ar' -binary with --enable-deterministic-archives (binutils project). -That, however, in combination with our previous long time working -default AR_FLAGS=cru causes warnings on such installations: -ar: `u' modifier ignored since `D' is the default (see `U') - -The 'u' option (at least with GNU binutils) did small optimization -during repeated builds because it instructed 'ar' to not -open/close unchanged *.o files and to rather read their contents -from old archive file. However, its removal should not cause a -big performance hit for usual workflows. - -Distributions started using --enable-deterministic-archives -knowing that it would disable the 'u', just to rather have a bit -more deterministic builds. - -Also, to justify this change a bit more, keeping 'u' in ARFLAGS -could only result in many per-project changes to override -Libtool's ARFLAGS default, just to silent such warnings. - -Fixes bug#19967. Reported by Eric Blake. - -* m4/libtool.m4 (_LT_PROG_AR): Default AR_FLAGS to 'cr'. -(_LT_REQUIRED_DARWIN_CHECKS): Use $AR_FLAGS instead 'cru' string. -* doc/libtool.texi: Do 's/ar cru/ar cr/' in whole documentation. -* NEWS: Document. - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=418129bc63afc312701e84cb8afa5ca413df1ab5] - -Signed-off-by: Li Wang <li.wang@windriver.com> -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - NEWS | 4 ++++ - doc/libtool.texi | 10 +++++----- - m4/libtool.m4 | 6 +++--- - 3 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/NEWS b/NEWS -index 71a932d..1518f09 100644 ---- a/NEWS -+++ b/NEWS -@@ -13,6 +13,10 @@ NEWS - list of user-visible changes between releases of GNU Libtool - variable, which obsoletes AR_FLAGS. This is due to naming conventions - among other *FLAGS and to be consistent with Automake's ARFLAGS. - -+** Important incompatible changes: -+ -+ - Libtool changed ARFLAGS/AR_FLAGS default from 'cru' to 'cr'. -+ - ** Bug fixes: - - - Fix a race condition in ltdl dryrun test that would cause spurious -diff --git a/doc/libtool.texi b/doc/libtool.texi -index 0298627..4c664bb 100644 ---- a/doc/libtool.texi -+++ b/doc/libtool.texi -@@ -602,7 +602,7 @@ Without libtool, the programmer would invoke the @command{ar} command to - create a static library: - - @example --burger$ @kbd{ar cru libhello.a hello.o foo.o} -+burger$ @kbd{ar cr libhello.a hello.o foo.o} - burger$ - @end example - -@@ -632,7 +632,7 @@ libtool are the same ones you would use to produce an executable named - a23$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.o hello.o} - *** Warning: Linking the shared library libhello.la against the - *** non-libtool objects foo.o hello.o is not portable! --ar cru .libs/libhello.a -+ar cr .libs/libhello.a - ranlib .libs/libhello.a - creating libhello.la - (cd .libs && rm -f libhello.la && ln -s ../libhello.la libhello.la) -@@ -662,7 +662,7 @@ archive, not a shared library (@pxref{Static libraries}).}: - @example - a23$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.lo hello.lo \ - -rpath /usr/local/lib -lm} --ar cru @value{objdir}/libhello.a foo.o hello.o -+ar cr @value{objdir}/libhello.a foo.o hello.o - ranlib @value{objdir}/libhello.a - creating libhello.la - (cd @value{objdir} && rm -f libhello.la && ln -s ../libhello.la libhello.la) -@@ -676,7 +676,7 @@ burger$ @kbd{libtool --mode=link gcc -g -O -o libhello.la foo.lo hello.lo \ - -rpath /usr/local/lib -lm} - rm -fr @value{objdir}/libhello.a @value{objdir}/libhello.la - ld -Bshareable -o @value{objdir}/libhello.so.0.0 @value{objdir}/foo.o @value{objdir}/hello.o -lm --ar cru @value{objdir}/libhello.a foo.o hello.o -+ar cr @value{objdir}/libhello.a foo.o hello.o - ranlib @value{objdir}/libhello.a - creating libhello.la - (cd @value{objdir} && rm -f libhello.la && ln -s ../libhello.la libhello.la) -@@ -6001,7 +6001,7 @@ in cases where it is necessary. - @subsection Archivers - - On all known systems, building a static library can be accomplished by --running @kbd{ar cru lib@var{name}.a @var{obj1}.o @var{obj2}.o @dots{}}, -+running @kbd{ar cr lib@var{name}.a @var{obj1}.o @var{obj2}.o @dots{}}, - where the @file{.a} file is the output library, and each @file{.o} file is an - object file. - -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index 6514196..add06ee 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1041,8 +1041,8 @@ int forced_loaded() { return 2;} - _LT_EOF - echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD -- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD -- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD -+ echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD -+ $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD - echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD - $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD - cat > conftest.c << _LT_EOF -@@ -1505,7 +1505,7 @@ _LT_DECL([], [AR], [1], [The archiver]) - # ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS - # variable obsoleted/removed. - --test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cru} -+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} - lt_ar_flags=$AR_FLAGS - _LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) - --- -2.23.0 - 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/libool.m4-add-ARFLAGS-variable.patch b/meta/recipes-devtools/libtool/libtool/libool.m4-add-ARFLAGS-variable.patch deleted file mode 100644 index bb11887cda..0000000000 --- a/meta/recipes-devtools/libtool/libtool/libool.m4-add-ARFLAGS-variable.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 4335de1dfb7d2ec728427e07a54136b94a2d40f6 Mon Sep 17 00:00:00 2001 -From: Pavel Raiskup <praiskup@redhat.com> -Date: Fri, 17 Apr 2015 15:05:42 +0200 -Subject: libool.m4: add ARFLAGS variable - -Libtool has used $AR_FLAGS since 2000-05-29 commit -8300de4c54e6f04f0d, Automake ARFLAGS since 2003-04-06 commit -a71b3490639831ca. Even though ARFLAGS is younger, it sounds like -better name according GNU Coding Standards. - -Related to bug#20082. - -* m4/libtool.m4 (_LT_PROG_AR): Copy ARFLAGS value into AR_FLAGS -variable if AR_FLAGS is not set. Add new _LT_DECL'ed variable -'lt_ar_flags' to keep the configure-time value of AR_FLAGS. The -new 'lt_ar_flags' is to be used as the default value for AR_FLAGS -at libtool-runtime. -* NEWS: Document. - -Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/libtool.git/commit/?id=4335de1dfb7d2ec728427e07a54136b94a2d40f6] - -Signed-off-by: Li Wang <li.wang@windriver.com> -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - NEWS | 6 ++++++ - m4/libtool.m4 | 17 +++++++++++++++-- - 2 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/NEWS b/NEWS -index d7ca434..71a932d 100644 ---- a/NEWS -+++ b/NEWS -@@ -7,6 +7,12 @@ NEWS - list of user-visible changes between releases of GNU Libtool - - LT_SYS_LIBRARY_PATH can be set in config.site, or at configure time - and persists correctly in the generated libtool script. - -+** New features: -+ -+ - Libtool script now supports (configure-time and runtime) ARFLAGS -+ variable, which obsoletes AR_FLAGS. This is due to naming conventions -+ among other *FLAGS and to be consistent with Automake's ARFLAGS. -+ - ** Bug fixes: - - - Fix a race condition in ltdl dryrun test that would cause spurious -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index 63acd09..6514196 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1497,9 +1497,22 @@ need_locks=$enable_libtool_lock - m4_defun([_LT_PROG_AR], - [AC_CHECK_TOOLS(AR, [ar], false) - : ${AR=ar} --: ${AR_FLAGS=cru} - _LT_DECL([], [AR], [1], [The archiver]) --_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) -+ -+# Use ARFLAGS variable as AR's operation code to sync the variable naming with -+# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have -+# higher priority because thats what people were doing historically (setting -+# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS -+# variable obsoleted/removed. -+ -+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cru} -+lt_ar_flags=$AR_FLAGS -+_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) -+ -+# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override -+# by AR_FLAGS because that was never working and AR_FLAGS is about to die. -+_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], -+ [Flags to create an archive]) - - AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], - [lt_cv_ar_at_file=no --- -2.23.0 - diff --git a/meta/recipes-devtools/libtool/libtool/prefix.patch b/meta/recipes-devtools/libtool/libtool/prefix.patch deleted file mode 100644 index a73df2e4a7..0000000000 --- a/meta/recipes-devtools/libtool/libtool/prefix.patch +++ /dev/null @@ -1,98 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Renames "libtool" -> "${TARGET_PREFIX}libtool" which makes sure -it can't be confused with the host libtool. - -Originally by: RP - -Updated: Date: 2010/06/28 -Nitin A Kamble <nitin.a.kamble@intel.com> - -It also adjusts libtool so that the header at the script is used for -script execution and not thevalue of $SHELL. This is because many -Makefiles change $SHELL so dash can get used to execute what is -otherwise configured as a bash shell script. Since we don't need to -execute scipts this way on any system I'm aware of us building upon, -the simplest fix is just to remove $SHELL. - -Updated: Date: 2011/11/09 -RP - -Updated by: Robert Yang <liezhi.yang@windriver.com> - -diff --git a/Makefile.am b/Makefile.am ---- a/Makefile.am -+++ b/Makefile.am -@@ -31,7 +31,7 @@ SUBDIRS = . - DIST_SUBDIRS = $(SUBDIRS) - EXTRA_DIST = - --BUILT_SOURCES = libtool libtoolize -+BUILT_SOURCES = $(host_alias)-libtool libtoolize - - CLEANFILES = - MOSTLYCLEANFILES = -@@ -67,7 +67,7 @@ build_scripts = $(srcdir)/$(aux_dir)/announce-gen \ - - EXTRA_DIST += bootstrap bootstrap.conf $(build_scripts) cfg.mk maint.mk \ - GNUmakefile --CLEANFILES += libtool libtoolize -+CLEANFILES += $(host_alias)-libtool libtoolize - - ## If a file is named several times below, and especially if it - ## is a distributed file created during Libtool bootstrap, we -@@ -276,7 +276,7 @@ configure_edit = $(bootstrap_edit) \ - -e 's|@srcdir\@|$(srcdir)|g' - - # The libtool distributor and the standalone libtool script. --bin_SCRIPTS = libtool -+bin_SCRIPTS = $(host_alias)-libtool - - libtoolize: $(libtoolize_in) $(config_status) - $(AM_V_at)rm -f '$@' -@@ -287,7 +287,7 @@ libtoolize: $(libtoolize_in) $(config_status) - # We used to do this with a 'stamp-vcl' file, but non-gmake builds - # would rerun configure on every invocation, so now we manually - # check the version numbers from the build rule when necessary. --libtool: $(ltmain_sh) $(config_status) $(dotversion) -+$(host_alias)-libtool: $(ltmain_sh) $(config_status) $(dotversion) - @$(rebuild); \ - if test -f '$@'; then \ - eval `'$(SED)' -n '/^package_revision=/p' '$@'`; \ -@@ -731,12 +731,12 @@ TESTS_ENVIRONMENT = MAKE="$(MAKE)" CC="$(CC)" CFLAGS="$(CFLAGS)" \ - - BUILDCHECK_ENVIRONMENT = _lt_pkgdatadir="$(abs_top_srcdir)" \ - LIBTOOLIZE="$(abs_top_builddir)/libtoolize" \ -- LIBTOOL="$(abs_top_builddir)/libtool" \ -+ LIBTOOL="$(abs_top_builddir)/$(host_alias)-libtool" \ - tst_aclocaldir="$(abs_top_srcdir)/m4" - - INSTALLCHECK_ENVIRONMENT = \ - LIBTOOLIZE="$(bindir)/`echo libtoolize |$(SED) '$(program_transform_name)'`" \ -- LIBTOOL="$(bindir)/`echo libtool |$(SED) '$(program_transform_name)'`" \ -+ LIBTOOL="$(bindir)/`echo $(host_alias)-libtool |$(SED) '$(program_transform_name)'`" \ - LTDLINCL="-I$(includedir)" \ - LIBLTDL="$(libdir)/libltdl.la" \ - tst_aclocaldir="$(aclocaldir)" -diff --git a/m4/libtool.m4 b/m4/libtool.m4 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -86,7 +86,8 @@ _LT_SET_OPTIONS([$0], [$1]) - LIBTOOL_DEPS=$ltmain - - # Always use our own libtool. --LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+LIBTOOL='$(top_builddir)' -+LIBTOOL="$LIBTOOL/${host_alias}-libtool" - AC_SUBST(LIBTOOL)dnl - - _LT_SETUP -@@ -199,7 +200,7 @@ aix3*) - esac - - # Global variables: --ofile=libtool -+ofile=${host_alias}-libtool - can_build_shared=yes - - # All known linkers require a '.a' archive for static linking (except MSVC, diff --git a/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch b/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch deleted file mode 100644 index b633bc41bb..0000000000 --- a/meta/recipes-devtools/libtool/libtool/unwind-opt-parsing.patch +++ /dev/null @@ -1,179 +0,0 @@ -Cut and paste the pieces of build-aux/options-parser inline into the main -ltmain.sh code. This removes a performance degradation caused by the -repeated calls to func_quote_for_eval, the mechanism funclib uses -to construct the functions used for option parsing. - -Upstream-Status: Submitted [Being discussed on mailing list Feb 2015] - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index d5cf07a..0f54303 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -342,11 +342,15 @@ _LT_EOF - # libtool_options_prep [ARG]... - # ----------------------------- - # Preparation for options parsed by libtool. --libtool_options_prep () --{ -+#libtool_options_prep () -+#{ - $debug_mode - - # Option defaults: -+ opt_verbose=false -+ opt_warning_types= -+ -+ # Option defaults: - opt_config=false - opt_dlopen= - opt_dry_run=false -@@ -382,19 +386,14 @@ libtool_options_prep () - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac -- -- # Pass back the list of options. -- func_quote_for_eval ${1+"$@"} -- libtool_options_prep_result=$func_quote_for_eval_result --} --func_add_hook func_options_prep libtool_options_prep -+#} - - - # libtool_parse_options [ARG]... - # --------------------------------- - # Provide handling for libtool specific options. --libtool_parse_options () --{ -+#libtool_parse_options () -+#{ - $debug_cmd - - # Perform our own loop to consume as many options as possible in -@@ -474,29 +473,90 @@ libtool_parse_options () - func_append preserve_args " $_G_opt" - ;; - -- # An option not handled by this hook function: -- *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; -- esac -- done -+ --debug|-x) debug_cmd='set -x' -+ func_echo "enabling shell trace mode" -+ $debug_cmd -+ ;; - -+ --no-warnings|--no-warning|--no-warn) -+ set dummy --warnings none ${1+"$@"} -+ shift -+ ;; - -- # save modified positional parameters for caller -- func_quote_for_eval ${1+"$@"} -- libtool_parse_options_result=$func_quote_for_eval_result --} --func_add_hook func_parse_options libtool_parse_options -+ --warnings|--warning|-W) -+ test $# = 0 && func_missing_arg $_G_opt && break -+ case " $warning_categories $1" in -+ *" $1 "*) -+ # trailing space prevents matching last $1 above -+ func_append_uniq opt_warning_types " $1" -+ ;; -+ *all) -+ opt_warning_types=$warning_categories -+ ;; -+ *none) -+ opt_warning_types=none -+ warning_func=: -+ ;; -+ *error) -+ opt_warning_types=$warning_categories -+ warning_func=func_fatal_error -+ ;; -+ *) -+ func_fatal_error \ -+ "unsupported warning category: '$1'" -+ ;; -+ esac -+ shift -+ ;; -+ -+ --verbose|-v) opt_verbose=: ;; -+ --version) func_version ;; -+ -\?|-h) func_usage ;; -+ --help) func_help ;; -+ -+ # Separate optargs to long options (plugins may need this): -+ --*=*) func_split_equals "$_G_opt" -+ set dummy "$func_split_equals_lhs" \ -+ "$func_split_equals_rhs" ${1+"$@"} -+ shift -+ ;; -+ -+ # Separate optargs to short options: -+ -W*) -+ func_split_short_opt "$_G_opt" -+ set dummy "$func_split_short_opt_name" \ -+ "$func_split_short_opt_arg" ${1+"$@"} -+ shift -+ ;; -+ -+ # Separate non-argument short options: -+ -\?*|-h*|-v*|-x*) -+ func_split_short_opt "$_G_opt" -+ set dummy "$func_split_short_opt_name" \ -+ "-$func_split_short_opt_arg" ${1+"$@"} -+ shift -+ ;; -+ -+ --) break ;; -+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; -+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;; -+ esac -+ done -+#} - -+# Display all warnings if -W was not given. -+test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - - - # libtool_validate_options [ARG]... - # --------------------------------- - # Perform any sanity checks on option settings and/or unconsumed - # arguments. --libtool_validate_options () --{ -+#libtool_validate_options () -+#{ - # save first non-option argument - if test 0 -lt $#; then -- nonopt=$1 -+ nonopt=$_G_opt - shift - fi - -@@ -537,20 +597,10 @@ libtool_validate_options () - generic_help=$help - help="Try '$progname --help --mode=$opt_mode' for more information." - } -+#} - -- # Pass back the unparsed argument list -- func_quote_for_eval ${1+"$@"} -- libtool_validate_options_result=$func_quote_for_eval_result --} --func_add_hook func_validate_options libtool_validate_options -- -- --# Process options as early as possible so that --help and --version --# can return quickly. --func_options ${1+"$@"} --eval set dummy "$func_options_result"; shift -- -- -+# Bail if the options were screwed! -+$exit_cmd $EXIT_FAILURE - - ## ----------- ## - ## Main. ## diff --git a/meta/recipes-devtools/libtool/libtool_2.4.6.bb b/meta/recipes-devtools/libtool/libtool_2.5.0.bb index fb40ce7317..44a4950574 100644 --- a/meta/recipes-devtools/libtool/libtool_2.4.6.bb +++ b/meta/recipes-devtools/libtool/libtool_2.5.0.bb @@ -7,7 +7,7 @@ RDEPENDS:${PN} += "bash" # # We want the results of libtool-cross preserved - don't stage anything ourselves. # -SYSROOT_DIRS_BLACKLIST += " \ +SYSROOT_DIRS_IGNORE += " \ ${bindir} \ ${datadir}/aclocal \ ${datadir}/libtool/build-aux \ diff --git a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb index e3ad6721fd..ddb60e717c 100644 --- a/meta/recipes-devtools/libtool/nativesdk-libtool_2.4.6.bb +++ b/meta/recipes-devtools/libtool/nativesdk-libtool_2.5.0.bb @@ -2,7 +2,6 @@ require libtool-${PV}.inc FILESEXTRAPATHS =. "${FILE_DIRNAME}/libtool:" -SRC_URI += "file://prefix.patch" SRC_URI += "file://fixinstall.patch" inherit nativesdk @@ -10,22 +9,15 @@ 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}/ - install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/ + install -m 0755 libtool ${D}${bindir}/ } SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess" libtoolnativesdk_sysroot_preprocess () { install -d ${SYSROOT_DESTDIR}${bindir_crossscripts}/ - install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool + install -m 755 ${D}${bindir}/libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/libtool } |