diff options
author | Christian Melki <christian.melki@t2data.com> | 2022-04-14 11:01:04 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2022-04-14 13:54:20 +0200 |
commit | 40943141a7c01cdcb94bcef2fd4a43849fcb2f3e (patch) | |
tree | 79af7a114454fc4ce72cc8fcddbc3b65d3df90b3 | |
parent | 7207d3a6241f31afda88e89aed3ec87eccc19e24 (diff) | |
download | ptxdist-40943141a7c01cdcb94bcef2fd4a43849fcb2f3e.tar.gz ptxdist-40943141a7c01cdcb94bcef2fd4a43849fcb2f3e.tar.xz |
host-autotools-libtool: Version bump. 2.4.6 -> 2.4.7
Some 7 years in the making.
Although a long time between releases, libtool didn't change that much.
https://savannah.gnu.org/forum/forum.php?forum_id=10139
Mostly bugfixes.
* Drop the entire patchset as everything seems to be included.
Signed-off-by: Christian Melki <christian.melki@t2data.com>
Message-Id: <20220414090104.741729-1-christian.melki@t2data.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
7 files changed, 2 insertions, 300 deletions
diff --git a/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch b/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch deleted file mode 100644 index 52e21f513..000000000 --- a/patches/libtool-2.4.6/0001-libool.m4-add-ARFLAGS-variable.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: Pavel Raiskup <praiskup@redhat.com> -Date: Fri, 17 Apr 2015 15:05:42 +0200 -Subject: [PATCH] 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. ---- - NEWS | 6 ++++++ - m4/libtool.m4 | 17 +++++++++++++++-- - 2 files changed, 21 insertions(+), 2 deletions(-) - -diff --git a/NEWS b/NEWS -index d7ca4341c393..590ce15ed5cd 100644 ---- a/NEWS -+++ b/NEWS -@@ -140,6 +140,12 @@ NEWS - list of user-visible changes between releases of GNU Libtool - - make check-local TESTSUITEFLAGS='-k "!expensive"' - -+** 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 long-standing latent bug in autom4te include path for autotests -diff --git a/m4/libtool.m4 b/m4/libtool.m4 -index a3bc337b79ad..2d6bda98fc92 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1493,9 +1493,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 diff --git a/patches/libtool-2.4.6/0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch b/patches/libtool-2.4.6/0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch deleted file mode 100644 index a137845e8..000000000 --- a/patches/libtool-2.4.6/0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch +++ /dev/null @@ -1,124 +0,0 @@ -From: Pavel Raiskup <praiskup@redhat.com> -Date: Fri, 17 Apr 2015 16:54:58 +0200 -Subject: [PATCH] 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. ---- - NEWS | 4 ++++ - doc/libtool.texi | 10 +++++----- - m4/libtool.m4 | 6 +++--- - 3 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/NEWS b/NEWS -index 590ce15ed5cd..2afc01ef38a9 100644 ---- a/NEWS -+++ b/NEWS -@@ -146,6 +146,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 long-standing latent bug in autom4te include path for autotests -diff --git a/doc/libtool.texi b/doc/libtool.texi -index 0298627c2464..4c664bb2ab05 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 2d6bda98fc92..3335def6d847 100644 ---- a/m4/libtool.m4 -+++ b/m4/libtool.m4 -@@ -1042,8 +1042,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 -@@ -1501,7 +1501,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)]) - diff --git a/patches/libtool-2.4.6/0003-libtool-fix-GCC-linking-with-specs.patch b/patches/libtool-2.4.6/0003-libtool-fix-GCC-linking-with-specs.patch deleted file mode 100644 index c40a2b711..000000000 --- a/patches/libtool-2.4.6/0003-libtool-fix-GCC-linking-with-specs.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Pavel Raiskup <praiskup@redhat.com> -Date: Fri, 18 Sep 2015 10:36:43 +0200 -Subject: [PATCH] libtool: fix GCC linking with -specs=* - -References: -https://bugzilla.redhat.com/show_bug.cgi?id=985592 - -* build-aux/ltmain.in (func_mode_link): Pass -specs=* -to the linker, Fedora uses this option for hardening. - -Signed-off-by: Pavel Raiskup <praiskup@redhat.com> ---- - build-aux/ltmain.in | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index d5cf07a63f59..0c40da06deb4 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -5360,10 +5360,12 @@ func_mode_link () - # -tp=* Portland pgcc target processor selection - # --sysroot=* for sysroot support - # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -+ # -specs=* GCC specs files - # -stdlib=* select c++ std lib with clang - -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=*| \ -+ -specs=*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result - func_append compile_command " $arg" diff --git a/patches/libtool-2.4.6/0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch b/patches/libtool-2.4.6/0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch deleted file mode 100644 index 67e103ca3..000000000 --- a/patches/libtool-2.4.6/0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Jeremy Huddleston Sequoia <jeremyhu@macports.org> -Date: Sun, 18 Oct 2015 21:55:39 -0700 -Subject: [PATCH] libtool: fix GCC/clang linking with -fsanitize=* - -References: -https://lists.gnu.org/archive/html/libtool/2014-04/msg00026.html - -* build-aux/ltmain.in (func_mode_link): Pass -fsanitize=* to the -linker to allow trivial use of the clang address sanitizer. - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org> -Copyright-paperwork-exempt: Yes ---- - build-aux/ltmain.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index 0c40da06deb4..d063aa44a486 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -5362,10 +5362,11 @@ func_mode_link () - # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - # -specs=* GCC specs files - # -stdlib=* select c++ std lib with clang -+ # -fsanitize=* Clang/GCC memory and address sanitizer - -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=*) -+ -specs=*|-fsanitize=*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result - func_append compile_command " $arg" diff --git a/patches/libtool-2.4.6/0005-libtool-pass-through-fuse-ld-flags.patch b/patches/libtool-2.4.6/0005-libtool-pass-through-fuse-ld-flags.patch deleted file mode 100644 index e7c88c60c..000000000 --- a/patches/libtool-2.4.6/0005-libtool-pass-through-fuse-ld-flags.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Mike Frysinger <vapier@gentoo.org> -Date: Sat, 13 Feb 2016 02:14:29 -0500 -Subject: [PATCH] libtool: pass through -fuse-ld flags - -Starting with gcc-4.8, there's a -fuse-ld flag that can be used to -select between bfd & gold. Make sure we pass it through to the -linking stage. - -* build-aux/ltmain.in (func_mode_link): Pass -fuse-ld=* flags -through. -Copyright-paperwork-exempt: Yes ---- - build-aux/ltmain.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in -index d063aa44a486..14e45d0b9d07 100644 ---- a/build-aux/ltmain.in -+++ b/build-aux/ltmain.in -@@ -5363,10 +5363,11 @@ func_mode_link () - # -specs=* GCC specs files - # -stdlib=* select c++ std lib with clang - # -fsanitize=* Clang/GCC memory and address sanitizer -+ # -fuse-ld=* Linker select flags for GCC - -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=*) -+ -specs=*|-fsanitize=*|-fuse-ld=*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result - func_append compile_command " $arg" diff --git a/patches/libtool-2.4.6/series b/patches/libtool-2.4.6/series deleted file mode 100644 index c0b3d421b..000000000 --- a/patches/libtool-2.4.6/series +++ /dev/null @@ -1,8 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-libool.m4-add-ARFLAGS-variable.patch -0002-ARFLAGS-use-cr-instead-of-cru-by-default.patch -0003-libtool-fix-GCC-linking-with-specs.patch -0004-libtool-fix-GCC-clang-linking-with-fsanitize.patch -0005-libtool-pass-through-fuse-ld-flags.patch -# 55967635b8c962a56e9ee2fd8dc06f7d - git-ptx-patches magic diff --git a/rules/host-autotools-libtool.make b/rules/host-autotools-libtool.make index 2d6a3eb94..b131d0211 100644 --- a/rules/host-autotools-libtool.make +++ b/rules/host-autotools-libtool.make @@ -14,8 +14,8 @@ LAZY_PACKAGES-$(PTXCONF_HOST_AUTOTOOLS_LIBTOOL) += host-autotools-libtool # # Paths and names # -HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.4.6 -HOST_AUTOTOOLS_LIBTOOL_MD5 := addf44b646ddb4e3919805aa88fa7c5e +HOST_AUTOTOOLS_LIBTOOL_VERSION := 2.4.7 +HOST_AUTOTOOLS_LIBTOOL_MD5 := ed40528d8a066ee3fffd714588721cff HOST_AUTOTOOLS_LIBTOOL := libtool-$(HOST_AUTOTOOLS_LIBTOOL_VERSION) HOST_AUTOTOOLS_LIBTOOL_SUFFIX := tar.gz HOST_AUTOTOOLS_LIBTOOL_URL := $(call ptx/mirror, GNU, libtool/$(HOST_AUTOTOOLS_LIBTOOL).$(HOST_AUTOTOOLS_LIBTOOL_SUFFIX)) |