From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mav.lukeshu.com (mav.lukeshu.com [IPv6:2001:19f0:5c00:8069:5400:ff:fe26:6a86]) by sourceware.org (Postfix) with ESMTPS id 3B8A53858D28; Mon, 10 Jun 2024 03:09:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B8A53858D28 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=lukeshu.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=lukeshu.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 3B8A53858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:19f0:5c00:8069:5400:ff:fe26:6a86 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717988951; cv=none; b=JZKq5Es/+cc5O+kJgtqTv1nYUYpOAMPVIcKL0qCGp4qGsKkriotXKswWPfMO5QMoEZjBe6nFSJeuXVtK1PBcLTlIz2PyXPylrf8IBRcFetZ39qs8Kb7uLjCP1js2weJQfg+CJG7s1ArkKrmDZfI92spfvuSii1PXk3wLg3kfaxU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717988951; c=relaxed/simple; bh=Tp7tLyc3Kigay4M0er/Yc0zgVSCFmtDSQmlouN+vQ60=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=ulxKnusLhgXRGRK5dgFEeEdjVCI02wURcSiwxnqywgJMmFSJQ0mnhtHgvav942zzjOC2MSg3dapzJKFJSvsOcdAP5PhYKo96RHe6yd4qGuw0oMN4qW++YsrN2TewcyP3VWxRI6Bi1164q74I2eELEIgSmELxsl2w06FFth3lWNI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from lukeshu-thinkpad-e15 (unknown [IPv6:2601:280:5e01:2a5d:aee0:10ff:fe55:8023]) by mav.lukeshu.com (Postfix) with ESMTPSA id B6BDB8067E; Sun, 9 Jun 2024 23:09:05 -0400 (EDT) From: "Luke T. Shumaker" To: binutils@sourceware.org, gdb-patches@sourceware.org Cc: "Ralf Wildenhues" , "Alfred M. Szmidt" , "Tom Tromey" , "Maciej W. Rozycki" , Jan Beulich , Joseph Myers , "Luke T. Shumaker" Subject: [PATCH v2 0/5] Add a ./bootstrap script to automate bundling and generating files Date: Sun, 9 Jun 2024 21:08:28 -0600 Message-ID: <20240610030833.472301-1-lukeshu@lukeshu.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240606201145.1747021-1-lukeshu@lukeshu.com> References: <20240606201145.1747021-1-lukeshu@lukeshu.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.7 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_STATUS,KAM_LOTSOFHASH,KAM_SHORT,LIKELY_SPAM_BODY,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Between the feedback I've received so far and having to update it for the recently-landed "autoupdate" patchset from Matthieu Longo, I think it's time to re-roll and submit a v2. v2: * readline: Fix examples/rlfe/configure.ac - Fix mistakes in the commit message * zlib: Remove files that should certainly not be checked in - Add *.obj to .gitignore. - Add justification for my beliefs to the commit message. * readline: Re-generate configure - This commit is new in response to the "autoupdate" patchset. * Add a ./bootstrap script to automate bundling and generating files - Fix the *.patch exception in .gitignore - Fix a mismatch with libtool hashes in bundle_gcc.mk - Pull the patch-loop into a macro in ./bootstrap - Update for Matthieu Longo's recent "autoupdate" patchset I tried adding `--irreversible-delete` when generating these patches, but that makes them not apply with `git am`. But I suspect that patchwork only messes up if the *first* file in the patch is a binary-file deletion; and so I'm hopeful that the `.gitignore` addition to that patch will cause patchwork to not mess up. Luke T. Shumaker (5): readline: Fix examples/rlfe/configure.in Update COPYING files from gnu.org zlib: Remove files that should certainly not be checked in readline: Re-generate configure Add a ./bootstrap script to automate bundling and generating files .gitignore | 2 + COPYING | 41 +- COPYING.LIB | 23 +- COPYING3 | 8 +- COPYING3.LIB | 8 +- bfd/COPYING | 8 +- bootstrap | 268 ++++ bootstrap.d/autotools0-install.mk | 47 + bootstrap.d/autotools1-addmissing.mk | 162 +++ bootstrap.d/autotools2-run.mk | 90 ++ bootstrap.d/bundle-gcc-include.txt | 47 + bootstrap.d/bundle-gcc.mk | 119 ++ bootstrap.d/bundle-gnulib.mk | 45 + bootstrap.d/bundle-licenses.mk | 47 + bootstrap.d/bundle-readline.mk | 45 + bootstrap.d/bundle-zlib.mk | 45 + ....m4sh-Add-Ralf-s-unpublished-changes.patch | 703 +++++++++++ ...btool-Fix-relink-mode-to-use-absolut.patch | 28 + .../1001-PR-target-59788.patch | 26 + ...output-of-find-to-enable-determinist.patch | 37 + ...AVE_DOS_BASED_FILE_SYSTEM-for-Cygwin.patch | 32 + ...from-libtool.m4-macros-and-config.rp.patch | 72 ++ .../2001-Sync-libtool.m4-with-GCC-tree.patch | 76 ++ .../2002-PR-target-38607.patch | 37 + ...NABLE_LOCK-ld-m-flags-Remove-non-can.patch | 51 + ...004-Update-libtool.m4-from-GCC-trunk.patch | 70 ++ ...005-Sync-top-level-btool.m4-with-GCC.patch | 39 + ...to-autoconf-2.69-and-automake-1.15.1.patch | 377 ++++++ ...e-GNU-Hurd-test-from-upstream.-In-up.patch | 50 + ...008-GCC-Pass-plugin-to-AR-and-RANLIB.patch | 85 ++ ...Check-if-AR-works-with-plugin-and-rc.patch | 69 ++ ...the-haiku-operating-system.-These-ar.patch | 28 + ...ol.m4-augment-symcode-for-Solaris-11.patch | 33 + ...libtool.m4-fix-nm-BSD-flag-detection.patch | 161 +++ ...he-NM-nm-over-here-B-option-with-pat.patch | 99 ++ ...btool-and-dependencies-for-Darwin20-.patch | 73 ++ ...y-support-for-shared-libs-on-VxWorks.patch | 81 ++ ...1-build-to-remove-source-paths-from-.patch | 58 + ...output-of-find-to-enable-determinist.patch | 44 + ...-uclinuxfdpiceabi-in-configure-scrip.patch | 53 + bootstrap.d/libtool-patches/README.sh | 24 + config/patches/0001-binutils-ChangeLog.patch | 830 +++++++++++++ .../0002-Finalized-intl-update-patches.patch | 1082 +++++++++++++++++ ...-libiberty-Disable-hwcaps-for-sha1.o.patch | 52 + ...he-sanitizer-configure-check-failure.patch | 101 ++ ...place-obsolete-macros-AC_HELP_STRING.patch | 45 + ...ce-obsolete-macros-AC_CANONICAL_SYST.patch | 42 + gas/COPYING | 8 +- gdb/COPYING | 8 +- gnulib/update-gnulib.sh | 3 + ...ce-obsolete-macros-AC_CANONICAL_SYST.patch | 27 + ...ace-obsolete-macros-AC_CONFIG_HEADER.patch | 24 + ...quare-brackets-around-arguments-of-A.patch | 23 + ...001-Another-part-of-fixing-make-TAGS.patch | 37 + ...to-autoconf-2.69-and-automake-1.15.1.patch | 198 +++ ...-configure-Implement-enable-host-pie.patch | 42 + .../patches/0004-merge-ChangeLog.patch | 52 + ...-Invoke-D-demangler-when-format-auto.patch | 45 + ...he-sanitizer-configure-check-failure.patch | 49 + ...ce-obsolete-macros-AC_AIX-AC_MINIX-a.patch | 27 + ...ace-obsolete-macros-AC_CONFIG_HEADER.patch | 24 + readline/patches/0001-gdb-bundle.patch | 102 ++ ...0002-Fix-Readline-8.1-build-on-mingw.patch | 40 + ...rt-changes-needed-to-properly-detect.patch | 255 ++++ ...dline-fix-extra-quit-message-problem.patch | 81 ++ ...-Fix-double-free-in-_rl_scxt_dispose.patch | 119 ++ readline/patches/0006-gdb-bad-merge.patch | 10 + ...place-obsolete-macros-AC_HELP_STRING.patch | 44 + ...ce-obsolete-macros-AC_AIX-AC_MINIX-a.patch | 28 + ...quare-brackets-around-argument-of-AC.patch | 23 + ...quare-brackets-around-arguments-of-A.patch | 23 + readline/readline/configure | 1 - readline/readline/examples/rlfe/configure.in | 2 +- sim/COPYING | 8 +- zlib/contrib/masmx64/gvmat64.obj | Bin 4119 -> 0 bytes zlib/contrib/masmx64/inffasx64.obj | Bin 5913 -> 0 bytes zlib/contrib/masmx86/gvmat32.obj | Bin 10241 -> 0 bytes zlib/contrib/masmx86/inffas32.obj | Bin 14893 -> 0 bytes zlib/example.c | 565 --------- zlib/minigzip.c | 440 ------- 80 files changed, 6807 insertions(+), 1064 deletions(-) create mode 100755 bootstrap create mode 100644 bootstrap.d/autotools0-install.mk create mode 100644 bootstrap.d/autotools1-addmissing.mk create mode 100644 bootstrap.d/autotools2-run.mk create mode 100644 bootstrap.d/bundle-gcc-include.txt create mode 100644 bootstrap.d/bundle-gcc.mk create mode 100644 bootstrap.d/bundle-gnulib.mk create mode 100644 bootstrap.d/bundle-licenses.mk create mode 100644 bootstrap.d/bundle-readline.mk create mode 100644 bootstrap.d/bundle-zlib.mk create mode 100644 bootstrap.d/libtool-patches/0001-ltmain.m4sh-Add-Ralf-s-unpublished-changes.patch create mode 100644 bootstrap.d/libtool-patches/1000-Backport-from-Libtool-Fix-relink-mode-to-use-absolut.patch create mode 100644 bootstrap.d/libtool-patches/1001-PR-target-59788.patch create mode 100644 bootstrap.d/libtool-patches/1002-libtool.m4-Sort-output-of-find-to-enable-determinist.patch create mode 100644 bootstrap.d/libtool-patches/1003-Do-not-use-HAVE_DOS_BASED_FILE_SYSTEM-for-Cygwin.patch create mode 100644 bootstrap.d/libtool-patches/2000-Remove-freebsd1-from-libtool.m4-macros-and-config.rp.patch create mode 100644 bootstrap.d/libtool-patches/2001-Sync-libtool.m4-with-GCC-tree.patch create mode 100644 bootstrap.d/libtool-patches/2002-PR-target-38607.patch create mode 100644 bootstrap.d/libtool-patches/2003-libtool.m4-_LT_ENABLE_LOCK-ld-m-flags-Remove-non-can.patch create mode 100644 bootstrap.d/libtool-patches/2004-Update-libtool.m4-from-GCC-trunk.patch create mode 100644 bootstrap.d/libtool-patches/2005-Sync-top-level-btool.m4-with-GCC.patch create mode 100644 bootstrap.d/libtool-patches/2006-Bump-to-autoconf-2.69-and-automake-1.15.1.patch create mode 100644 bootstrap.d/libtool-patches/2007-libtool.m4-update-GNU-Hurd-test-from-upstream.-In-up.patch create mode 100644 bootstrap.d/libtool-patches/2008-GCC-Pass-plugin-to-AR-and-RANLIB.patch create mode 100644 bootstrap.d/libtool-patches/2009-GCC-Check-if-AR-works-with-plugin-and-rc.patch create mode 100644 bootstrap.d/libtool-patches/2010-Add-support-for-the-haiku-operating-system.-These-ar.patch create mode 100644 bootstrap.d/libtool-patches/2011-libtool.m4-augment-symcode-for-Solaris-11.patch create mode 100644 bootstrap.d/libtool-patches/2012-libtool.m4-fix-nm-BSD-flag-detection.patch create mode 100644 bootstrap.d/libtool-patches/2013-libtool.m4-fix-the-NM-nm-over-here-B-option-with-pat.patch create mode 100644 bootstrap.d/libtool-patches/2014-Darwin-Update-libtool-and-dependencies-for-Darwin20-.patch create mode 100644 bootstrap.d/libtool-patches/2015-Generic-configury-support-for-shared-libs-on-VxWorks.patch create mode 100644 bootstrap.d/libtool-patches/2016-Fix-hppa64-hpux11-build-to-remove-source-paths-from-.patch create mode 100644 bootstrap.d/libtool-patches/2017-libtool.m4-Sort-output-of-find-to-enable-determinist.patch create mode 100644 bootstrap.d/libtool-patches/2018-FDPIC-Handle-arm-uclinuxfdpiceabi-in-configure-scrip.patch create mode 100644 bootstrap.d/libtool-patches/README.sh create mode 100644 config/patches/0001-binutils-ChangeLog.patch create mode 100644 config/patches/0002-Finalized-intl-update-patches.patch create mode 100644 config/patches/0003-libiberty-Disable-hwcaps-for-sha1.o.patch create mode 100644 config/patches/0004-mmap-Avoid-the-sanitizer-configure-check-failure.patch create mode 100644 config/patches/0005-autoupdate-replace-obsolete-macros-AC_HELP_STRING.patch create mode 100644 config/patches/0006-autoupdate-replace-obsolete-macros-AC_CANONICAL_SYST.patch create mode 100644 libbacktrace/patches/0001-autoupdate-replace-obsolete-macros-AC_CANONICAL_SYST.patch create mode 100644 libbacktrace/patches/0002-autoupdate-replace-obsolete-macros-AC_CONFIG_HEADER.patch create mode 100644 libbacktrace/patches/0003-autoupdate-add-square-brackets-around-arguments-of-A.patch create mode 100644 libdecnumber/patches/0001-Another-part-of-fixing-make-TAGS.patch create mode 100644 libdecnumber/patches/0002-Bump-to-autoconf-2.69-and-automake-1.15.1.patch create mode 100644 libdecnumber/patches/0003-configure-Implement-enable-host-pie.patch create mode 100644 libdecnumber/patches/0004-merge-ChangeLog.patch create mode 100644 libiberty/patches/0001-libiberty-Invoke-D-demangler-when-format-auto.patch create mode 100644 libiberty/patches/0002-mmap-Avoid-the-sanitizer-configure-check-failure.patch create mode 100644 libiberty/patches/0003-autoupdate-replace-obsolete-macros-AC_AIX-AC_MINIX-a.patch create mode 100644 libiberty/patches/0004-autoupdate-replace-obsolete-macros-AC_CONFIG_HEADER.patch create mode 100644 readline/patches/0001-gdb-bundle.patch create mode 100644 readline/patches/0002-Fix-Readline-8.1-build-on-mingw.patch create mode 100644 readline/patches/0003-readline-back-port-changes-needed-to-properly-detect.patch create mode 100644 readline/patches/0004-gdb-readline-fix-extra-quit-message-problem.patch create mode 100644 readline/patches/0005-readline-Fix-double-free-in-_rl_scxt_dispose.patch create mode 100644 readline/patches/0006-gdb-bad-merge.patch create mode 100644 readline/patches/0007-autoupdate-replace-obsolete-macros-AC_HELP_STRING.patch create mode 100644 readline/patches/0008-autoupdate-replace-obsolete-macros-AC_AIX-AC_MINIX-a.patch create mode 100644 readline/patches/0009-autoupdate-add-square-brackets-around-argument-of-AC.patch create mode 100644 readline/patches/0010-autoupdate-add-square-brackets-around-arguments-of-A.patch delete mode 100644 zlib/contrib/masmx64/gvmat64.obj delete mode 100644 zlib/contrib/masmx64/inffasx64.obj delete mode 100644 zlib/contrib/masmx86/gvmat32.obj delete mode 100644 zlib/contrib/masmx86/inffas32.obj delete mode 100644 zlib/example.c delete mode 100644 zlib/minigzip.c Range-diff against v1: 1: 0c538231ce4 ! 1: bbcb83a2423 readline: Fix examples/rlfe/configure.ac @@ Metadata Author: Luke T. Shumaker ## Commit message ## - readline: Fix examples/rlfe/configure.ac + readline: Fix examples/rlfe/configure.in It has been impossible to run `autoconf` in `readline/readline/examples/rlfe/` ever since it was moved there from - `readline/readline/examples/rlfe/` in 6999161a2a3 (Move readline to - the readline/readline subdirectory, Tom Tromey, 2019-10-05). The - confure.ac uses a "../"* sequence to get to the top-directory's + `readline/examples/rlfe/` in 6999161a2a3 (Move readline to the + readline/readline subdirectory, Tom Tromey, 2019-10-05). The + confure.in uses a "../"* sequence to get to the top-directory's config/override.m4, but another "../" wasn't added when it was moved a directory deeper. Fix that; add another "../". This allows `autoconf` to once again generate the verbatim `configure` file that is already checked in. + --- + v2: + - Fix mistakes in the commit message + ## readline/readline/examples/rlfe/configure.in ## @@ dnl Process this file with autoconf to produce a configure script. 2: 22bdb3795d3 = 2: 50437b707fd Update COPYING files from gnu.org 3: 04b2314c068 ! 3: 1834d9632bf zlib: Remove files that should certainly not be checked in @@ Commit message zlib: Remove files that should certainly not be checked in The *.obj files are compiled binaries that should have been - .gitignore'd + .gitignore'd (and so also add an `*.obj` entry to .gitignore). zlib/example.c and zlib/minigzip.c are outdated duplicates of zlib/test/example.c and zlib/test/minigzip.c + My justification believing that the *.obj files should be removed and + ignored is as follows: + + - AFAICT, these files are not used by binutils-gdb. + + - As shown in the final commit of this patch series, the zlib + directory is perfectly re-created *except for these files* by + extracting zlib-1.2.12.tar over zlib-1.2.10.tar. Neither of those + tarballs include any .obj files. + + - These files were first added to binutils-gdb.git from gcc.git in + 5ca28f79288 (Import zlib from GCC, H.J. Lu, 2015-03-13), which is + is a faithful (except for some $Id$ mangling) of zlib-1.2.7.tar. + That tarball does not include any .obj files either. + + - However, zlib tarballs did include some .obj files in the + v1.2.[0-3] range. + + - And whadayaknow, the .obj files were first added to gcc.git in + 303ae446cf2a (Initial revision, Tom Tromey, 2005-09-12), which + bundled zlib-1.2.1.tar (which as I just said is indeed one of the + archives that includes .obj files). + + - Ever since being first checked in to gcc.git/binutils-gdb.git, the + .obj files have never once been updated, even though the associated + assembly source code has had substantial revisions. + + --- + v2: + - Add *.obj to .gitignore. + - Add justification for my beliefs to the commit message. + + ## .gitignore ## +@@ + *.la + *.lo + *.o ++*.obj + *.pyc + *.tmp + *.a + ## zlib/contrib/masmx64/gvmat64.obj (deleted) ## Binary files zlib/contrib/masmx64/gvmat64.obj and /dev/null differ -: ----------- > 4: b259934b6b2 readline: Re-generate configure 4: 5a28fa0ed2b ! 5: 6c18aa5a2d7 Add a ./bootstrap script to automate bundling and generating files @@ Commit message documentation I'm thinking of updating (MAINTAINERS, readline/README...) is already out-of-date anyway. + --- + v2: + - Fix the *.patch exception in .gitignore + - Fix a mismatch with libtool hashes in bundle_gcc.mk + - Pull the patch-loop into a macro in ./bootstrap + - Update for Matthieu Longo's recent "autoupdate" patchset + ## .gitignore ## @@ *.diff *.patch -+!*patches/*.patch ++!**/*patches/*.patch *.orig *.rej @@ bootstrap (new) + + +endef ++# Usage: $(call apply-patches,dir,flags,patches...) ++apply-patches = @cd $1; for patch in $3; do echo "cd $1 && patch $2 -i $$patch"; patch $2 -i $$patch ++Date: Tue, 28 May 2024 10:49:40 +0100 ++Subject: [PATCH] autoupdate: replace obsolete macros AC_HELP_STRING ++ ++- AC_HELP_STRING by AS_HELP_STRING ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fHELP_005fSTRING-1 ++Except for the ifdef in lib-prefix.m4, make the defun of AC_LIB_ARG_WITH ++unconditional. ++ ++diff --git a/config/enable.m4 b/config/enable.m4 ++index 88b29b8aa7f..119c3701095 100644 ++--- a/config/enable.m4 +++++ b/config/enable.m4 ++@@ -11,7 +11,7 @@ dnl See docs/html/17_intro/configury.html#enable for documentation. ++ dnl ++ AC_DEFUN([GCC_ENABLE],[dnl ++ m4_define([_g_switch],[--enable-$1])dnl ++-m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl +++m4_define([_g_help],[AS_HELP_STRING([_g_switch$3],[$4 @<:@default=$2@:>@])])dnl ++ AC_ARG_ENABLE($1,_g_help, ++ m4_bmatch([$5], ++ [^permit ], ++diff --git a/config/lib-prefix.m4 b/config/lib-prefix.m4 ++index c719bc80900..0c6ce029d66 100644 ++--- a/config/lib-prefix.m4 +++++ b/config/lib-prefix.m4 ++@@ -8,12 +8,9 @@ dnl the same distribution terms as the rest of that program. ++ ++ dnl From Bruno Haible. ++ ++-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and ++-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't +++dnl AC_LIB_ARG_WITH is similar to AC_ARG_WITH except that it doesn't ++ dnl require excessive bracketing. ++-ifdef([AC_HELP_STRING], ++-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], ++-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) +++AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])]) ++ ++ dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed ++ dnl to access previously installed libraries. The basic assumption is that ++-- ++2.45.1 ++ + + ## config/patches/0006-autoupdate-replace-obsolete-macros-AC_CANONICAL_SYST.patch (new) ## +@@ ++From 29496481662736f0a24bfc1daf31dbfc9d2bb7ee Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:43 +0100 ++Subject: [PATCH] autoupdate: replace obsolete macros AC_CANONICAL_SYSTEM ++ ++- AC_CANONICAL_SYSTEM by: ++ * AC_CANONICAL_HOST where host, and host_alias are needed ++ * AC_CANONICAL_TARGET where target_alias is needed ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fCANONICAL_005fTARGET-1 ++ ++diff --git a/config/acx.m4 b/config/acx.m4 ++index 7efe98aaf96..69f4bfa4d76 100644 ++--- a/config/acx.m4 +++++ b/config/acx.m4 ++@@ -107,9 +107,9 @@ AC_SUBST([target_subdir]) []dnl ++ ++ ++ #### ++-# _NCN_TOOL_PREFIXES: Some stuff that oughtta be done in AC_CANONICAL_SYSTEM +++# _NCN_TOOL_PREFIXES: Some stuff that oughtta be done in AC_CANONICAL_TARGET ++ # or AC_INIT. ++-# These demand that AC_CANONICAL_SYSTEM be called beforehand. +++# These demand that AC_CANONICAL_HOST and AC_CANONICAL_TARGET be called beforehand. ++ AC_DEFUN([_NCN_TOOL_PREFIXES], ++ [ncn_tool_prefix= ++ test -n "$host_alias" && ncn_tool_prefix=$host_alias- ++diff --git a/config/lthostflags.m4 b/config/lthostflags.m4 ++index bc0f59ee79e..4a389a75ea8 100644 ++--- a/config/lthostflags.m4 +++++ b/config/lthostflags.m4 ++@@ -10,7 +10,7 @@ dnl Defines and AC_SUBSTs lt_host_flags ++ ++ ++ AC_DEFUN([ACX_LT_HOST_FLAGS], [ ++-AC_REQUIRE([AC_CANONICAL_SYSTEM]) +++AC_REQUIRE([AC_CANONICAL_HOST]) ++ ++ case $host in ++ *-cygwin* | *-mingw*) ++-- ++2.45.1 + ## gnulib/update-gnulib.sh ## @@ gnulib/update-gnulib.sh: apply_patches "patches/0001-use-windows-stat" autoconf && autoheader && + ## libbacktrace/patches/0001-autoupdate-replace-obsolete-macros-AC_CANONICAL_SYST.patch (new) ## +@@ ++From 29496481662736f0a24bfc1daf31dbfc9d2bb7ee Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:43 +0100 ++Subject: [PATCH] autoupdate: replace obsolete macros AC_CANONICAL_SYSTEM ++ ++- AC_CANONICAL_SYSTEM by: ++ * AC_CANONICAL_HOST where host, and host_alias are needed ++ * AC_CANONICAL_TARGET where target_alias is needed ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fCANONICAL_005fTARGET-1 ++ ++diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac ++index da61eff0e56..c5d84f77358 100644 ++--- a/libbacktrace/configure.ac +++++ b/libbacktrace/configure.ac ++@@ -37,7 +37,8 @@ if test -n "${with_target_subdir}"; then ++ AM_ENABLE_MULTILIB(, ..) ++ fi ++ ++-AC_CANONICAL_SYSTEM +++AC_CANONICAL_HOST +++AC_CANONICAL_TARGET ++ target_alias=${target_alias-$host_alias} ++ ++ AC_USE_SYSTEM_EXTENSIONS ++-- ++2.45.1 ++ + + ## libbacktrace/patches/0002-autoupdate-replace-obsolete-macros-AC_CONFIG_HEADER.patch (new) ## +@@ ++From bb85488e6f502ae7c3e8ddf2a9e9058a85d7e887 Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:44 +0100 ++Subject: [PATCH] autoupdate: replace obsolete macros AC_CONFIG_HEADER ++ ++- AC_CONFIG_HEADER by AC_CONFIG_HEADERS ++ https://www.gnu.org/software/automake/manual/1.12.2/html_node/Obsolete-Macros.html#index-AM_005fCONFIG_005fHEADER ++ ++diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac ++index c5d84f77358..6aa3ceb360b 100644 ++--- a/libbacktrace/configure.ac +++++ b/libbacktrace/configure.ac ++@@ -31,7 +31,7 @@ ++ ++ AC_INIT(package-unused, version-unused,, libbacktrace) ++ AC_CONFIG_SRCDIR(backtrace.h) ++-AC_CONFIG_HEADER(config.h) +++AC_CONFIG_HEADERS([config.h]) ++ ++ if test -n "${with_target_subdir}"; then ++ AM_ENABLE_MULTILIB(, ..) ++-- ++2.45.1 ++ + + ## libbacktrace/patches/0003-autoupdate-add-square-brackets-around-arguments-of-A.patch (new) ## +@@ ++From 3dee0baea2e8129b6ebfde9567a0b11c5147af56 Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:47 +0100 ++Subject: [PATCH] autoupdate: add square brackets around arguments of AC_INIT ++ ++https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fINIT-2 ++ ++diff --git a/libbacktrace/configure.ac b/libbacktrace/configure.ac ++index 6aa3ceb360b..1d7aedc74b1 100644 ++--- a/libbacktrace/configure.ac +++++ b/libbacktrace/configure.ac ++@@ -29,7 +29,7 @@ ++ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ++ # POSSIBILITY OF SUCH DAMAGE. ++ ++-AC_INIT(package-unused, version-unused,, libbacktrace) +++AC_INIT([package-unused], [version-unused], [], [libbacktrace]) ++ AC_CONFIG_SRCDIR(backtrace.h) ++ AC_CONFIG_HEADERS([config.h]) ++ ++-- ++2.45.1 ++ + ## libdecnumber/patches/0001-Another-part-of-fixing-make-TAGS.patch (new) ## @@ +From 53bef1c10759f1fd7faf675459871b2f4cc12e53 Mon Sep 17 00:00:00 2001 @@ -19,7 +19,7 @@ dnl On some versions of SunOS4 at least, strncmp reads a word at + [AC_TRY_RUN([ + /* Test by Jim Wilson and Kaveh Ghazi. + ## libiberty/patches/0003-autoupdate-replace-obsolete-macros-AC_AIX-AC_MINIX-a.patch (new) ## +@@ ++From 2cac47f5bab66389e96fc9bca6bb683642984b43 Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:41 +0100 ++Subject: [PATCH] autoupdate: replace obsolete macros AC_AIX, AC_MINIX, and ++ AC_GNU_SOURCE ++ ++- AC_AIX, AC_MINIX, and AC_GNU_SOURCE by AC_USE_SYSTEM_EXTENSIONS ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fAIX ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fMINIX-1 ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fGNU_005fSOURCE-1 ++ ++diff --git a/libiberty/configure.ac b/libiberty/configure.ac ++index 0888e638896..4f76b62fcfd 100644 ++--- a/libiberty/configure.ac +++++ b/libiberty/configure.ac ++@@ -172,7 +172,7 @@ AC_MSG_NOTICE([target_header_dir = $target_header_dir]) ++ ++ GCC_NO_EXECUTABLES ++ AC_PROG_CC ++-AC_GNU_SOURCE +++AC_USE_SYSTEM_EXTENSIONS ++ AC_SYS_LARGEFILE ++ AC_PROG_CPP_WERROR ++ ++-- ++2.45.1 ++ + + ## libiberty/patches/0004-autoupdate-replace-obsolete-macros-AC_CONFIG_HEADER.patch (new) ## +@@ ++From bb85488e6f502ae7c3e8ddf2a9e9058a85d7e887 Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:44 +0100 ++Subject: [PATCH] autoupdate: replace obsolete macros AC_CONFIG_HEADER ++ ++- AC_CONFIG_HEADER by AC_CONFIG_HEADERS ++ https://www.gnu.org/software/automake/manual/1.12.2/html_node/Obsolete-Macros.html#index-AM_005fCONFIG_005fHEADER ++ ++diff --git a/libiberty/configure.ac b/libiberty/configure.ac ++index 4f76b62fcfd..c27e08e1428 100644 ++--- a/libiberty/configure.ac +++++ b/libiberty/configure.ac ++@@ -205,7 +205,7 @@ dnl AM_PROG_LIBTOOL ++ ++ dnl When we start using automake: ++ dnl AM_CONFIG_HEADER(config.h:config.in) ++-AC_CONFIG_HEADER(config.h:config.in) +++AC_CONFIG_HEADERS([config.h:config.in]) ++ ++ dnl When we start using automake: ++ dnl AM_MAINTAINER_MODE ++-- ++2.45.1 ++ + ## readline/patches/0001-gdb-bundle.patch (new) ## @@ +diff --git a/Makefile.in b/Makefile.in @@ -1,4 +1,4 @@ + + * pty.c: Import from screen-4.0.2. + * configure.in, Makefile.in, config.h.in: Set up autoconf handling, + + ## readline/patches/0007-autoupdate-replace-obsolete-macros-AC_HELP_STRING.patch (new) ## +@@ ++From c22e3e25de0aa7841c4ef7c6b9e167b5685c2671 Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:40 +0100 ++Subject: [PATCH] autoupdate: replace obsolete macros AC_HELP_STRING ++ ++- AC_HELP_STRING by AS_HELP_STRING ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fHELP_005fSTRING-1 ++Except for the ifdef in lib-prefix.m4, make the defun of AC_LIB_ARG_WITH ++unconditional. ++ ++diff --git a/configure.ac b/configure.ac ++index 912c99b6575..c800f1c8667 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -45,7 +45,7 @@ dnl configure defaults ++ opt_curses=no ++ ++ dnl arguments to configure ++-AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval) +++AC_ARG_WITH(curses, AS_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval) ++ ++ if test "$opt_curses" = "yes"; then ++ prefer_curses=yes ++@@ -58,12 +58,12 @@ opt_shared_libs=no ++ opt_install_examples=no ++ opt_bracketed_paste_default=yes ++ ++-AC_ARG_ENABLE(multibyte, AC_HELP_STRING([--enable-multibyte], [enable multibyte characters if OS supports them]), opt_multibyte=$enableval) ++-dnl AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval) ++-AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval) ++-AC_ARG_ENABLE(install-examples, AC_HELP_STRING([--disable-install-examples], [don't install examples [[default=install]]]), opt_install_examples=$enableval) +++AC_ARG_ENABLE(multibyte, AS_HELP_STRING([--enable-multibyte], [enable multibyte characters if OS supports them]), opt_multibyte=$enableval) +++dnl AC_ARG_ENABLE(shared, AS_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval) +++AC_ARG_ENABLE(static, AS_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval) +++AC_ARG_ENABLE(install-examples, AS_HELP_STRING([--disable-install-examples], [don't install examples [[default=install]]]), opt_install_examples=$enableval) ++ ++-AC_ARG_ENABLE(bracketed-paste-default, AC_HELP_STRING([--disable-bracketed-paste-default], [disable bracketed paste by default [[default=enable]]]), opt_bracketed_paste_default=$enableval) +++AC_ARG_ENABLE(bracketed-paste-default, AS_HELP_STRING([--disable-bracketed-paste-default], [disable bracketed paste by default [[default=enable]]]), opt_bracketed_paste_default=$enableval) ++ ++ if test $opt_multibyte = no; then ++ AC_DEFINE(NO_MULTIBYTE_SUPPORT) ++-- ++2.45.1 ++ + + ## readline/patches/0008-autoupdate-replace-obsolete-macros-AC_AIX-AC_MINIX-a.patch (new) ## +@@ ++From 2cac47f5bab66389e96fc9bca6bb683642984b43 Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:41 +0100 ++Subject: [PATCH] autoupdate: replace obsolete macros AC_AIX, AC_MINIX, and ++ AC_GNU_SOURCE ++ ++- AC_AIX, AC_MINIX, and AC_GNU_SOURCE by AC_USE_SYSTEM_EXTENSIONS ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fAIX ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fMINIX-1 ++ https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fGNU_005fSOURCE-1 ++ ++diff --git a/configure.ac b/configure.ac ++index c800f1c8667..9ea2a6b4b5e 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -115,8 +115,7 @@ test -z "$CFLAGS" && want_auto_cflags=1 ++ ++ AC_PROG_MAKE_SET ++ AC_PROG_CC ++-dnl AC_AIX ++-AC_MINIX +++AC_USE_SYSTEM_EXTENSIONS ++ ++ # If we're using gcc and the user hasn't specified CFLAGS, add -O2 to CFLAGS ++ if test -n "$want_auto_cflags" ; then ++-- ++2.45.1 ++ + + ## readline/patches/0009-autoupdate-add-square-brackets-around-argument-of-AC.patch (new) ## +@@ ++From de278b64701654cb77624319563f8e4fe6077b0d Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:46 +0100 ++Subject: [PATCH] autoupdate: add square brackets around argument of AC_PREREQ ++ ++https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fPREREQ-1 ++ ++diff --git a/configure.ac b/configure.ac ++index 9ea2a6b4b5e..6a9d77f0c51 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -27,7 +27,7 @@ m4_include([../../config/override.m4]) ++ AC_INIT(readline, 8.1, bug-readline@gnu.org) ++ ++ dnl make sure we are using a recent autoconf version ++-AC_PREREQ(2.50) +++AC_PREREQ([2.50]) ++ ++ AC_CONFIG_SRCDIR(readline.h) ++ dnl GDB LOCAL ++-- ++2.45.1 ++ + + ## readline/patches/0010-autoupdate-add-square-brackets-around-arguments-of-A.patch (new) ## +@@ ++From 3dee0baea2e8129b6ebfde9567a0b11c5147af56 Mon Sep 17 00:00:00 2001 ++From: Matthieu Longo ++Date: Tue, 28 May 2024 10:49:47 +0100 ++Subject: [PATCH] autoupdate: add square brackets around arguments of AC_INIT ++ ++https://www.gnu.org/savannah-checkouts/gnu/autoconf/manual/autoconf-2.72/autoconf.html#index-AC_005fINIT-2 ++ ++diff --git a/configure.ac b/configure.ac ++index 6a9d77f0c51..f2900752e8d 100644 ++--- a/configure.ac +++++ b/configure.ac ++@@ -24,7 +24,7 @@ AC_REVISION([for Readline 8.1, version 2.90]) ++ ++ m4_include([../../config/override.m4]) ++ ++-AC_INIT(readline, 8.1, bug-readline@gnu.org) +++AC_INIT([readline], [8.1], [bug-readline@gnu.org]) ++ ++ dnl make sure we are using a recent autoconf version ++ AC_PREREQ([2.50]) ++-- ++2.45.1 ++ -- Happy hacking, ~ Luke T. Shumaker