Compare commits
No commits in common. 'c9' and 'i10c-beta' have entirely different histories.
@ -1 +1 @@
|
||||
e891c3193029775e83e0534ac0ee0c4c711f6d23 SOURCES/autoconf-2.69.tar.xz
|
||||
1b5b1dbed849c6653be47c56d28d26fcf3f7238a SOURCES/autoconf-2.71.tar.xz
|
||||
|
||||
@ -1 +1 @@
|
||||
SOURCES/autoconf-2.69.tar.xz
|
||||
SOURCES/autoconf-2.71.tar.xz
|
||||
|
||||
@ -0,0 +1,69 @@
|
||||
From 412166e185c00d6eacbe67dfcb0326f622ec4020 Mon Sep 17 00:00:00 2001
|
||||
From: Xi Ruoyao <xry111@xry111.site>
|
||||
Date: Fri, 30 Sep 2022 11:36:03 -0400
|
||||
Subject: [PATCH] Fix testsuite failures with bash 5.2.
|
||||
|
||||
Bash v5.2 includes several new optimizations to the number of
|
||||
subshells used for various constructs; as a side effect, the value of
|
||||
SHLVL is less stable than it used to be. Add SHLVL to the list of
|
||||
built-in shell variables with unstable values, to be ignored when
|
||||
checking for inappropriate differences to the shell environment
|
||||
before and after a macro invocation / between two configure runs.
|
||||
|
||||
Problem and solution reported by Xi Ruoyao in
|
||||
https://lists.gnu.org/archive/html/autoconf/2022-09/msg00015.html
|
||||
Problem also reported by Bruce Dubbs in
|
||||
https://lists.gnu.org/archive/html/bug-autoconf/2022-09/msg00010.html
|
||||
|
||||
* tests/local.at (_AT_CHECK_ENV, AT_CONFIG_CMP): Ignore changes in
|
||||
value of SHLVL.
|
||||
Copyright-paperwork-exempt: yes
|
||||
|
||||
Conflicts:
|
||||
tests/local.at
|
||||
(First block needed Fuzz 2, other blocks needed offset)
|
||||
---
|
||||
tests/local.at | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/tests/local.at b/tests/local.at
|
||||
index b5e68d37..e602c12b 100644
|
||||
--- a/tests/local.at
|
||||
+++ b/tests/local.at
|
||||
@@ -352,7 +352,7 @@ m4_define([AT_CHECK_CONFIGURE],
|
||||
# - AC_SUBST'ed variables
|
||||
# (FIXME: Generate a list of these automatically.)
|
||||
# - _|@|.[*#?$].|argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS
|
||||
-# |START_TIME|ToD|_AST_FEATURES
|
||||
+# |SHLVL|START_TIME|ToD|_AST_FEATURES
|
||||
# Some variables some shells use and change.
|
||||
# `.[*#?$].' catches `$#' etc. which are displayed like this:
|
||||
# | '!'=18186
|
||||
@@ -403,7 +403,7 @@ if test -f state-env.before && test -f state-env.after; then
|
||||
[GREP|[EF]GREP|SED],
|
||||
[[_@]|.[*@%:@?$].],
|
||||
[argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM],
|
||||
- [SECONDS|START_TIME|ToD|_AST_FEATURES]))=' \
|
||||
+ [SECONDS|SHLVL|START_TIME|ToD|_AST_FEATURES]))=' \
|
||||
$act_file ||
|
||||
test $? -eq 1 || echo failed >&2
|
||||
) 2>stderr-$act_file |
|
||||
@@ -434,6 +434,7 @@ fi
|
||||
# - PPID [bash, zsh]
|
||||
# - RANDOM [bash, zsh]
|
||||
# - SECONDS [bash, zsh]
|
||||
+# - SHLVL [bash]
|
||||
# - START_TIME [NetBSD sh]
|
||||
# - ToD [NetBSD sh]
|
||||
# - '$' [zsh]
|
||||
@@ -481,6 +482,7 @@ do
|
||||
/^PPID=/ d
|
||||
/^RANDOM=/ d
|
||||
/^SECONDS=/ d
|
||||
+ /^SHLVL=/ d
|
||||
/^START_TIME=/ d
|
||||
/^ToD=/ d
|
||||
/'\'\\\$\''=/ d
|
||||
--
|
||||
2.37.3
|
||||
|
||||
@ -0,0 +1,31 @@
|
||||
From f460883035ef849a2248b1713f711292ec19f4f0 Mon Sep 17 00:00:00 2001
|
||||
From: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
|
||||
Date: Fri, 14 May 2021 09:06:20 +0300
|
||||
Subject: [PATCH] _AC_PROG_CXX_STDCXX_EDITION_TRY: fix typo in variable name
|
||||
|
||||
The typo causes "ac_prog_cxx_stdcxx" to be always set to "cxx11",
|
||||
regardless of whether the C++ compiler supports C++11.
|
||||
Message-Id: <YJ4TXAeJcvU0oSec@FSAPPLE2215.fi.f-secure.com>
|
||||
(tiny change)
|
||||
---
|
||||
lib/autoconf/c.m4 | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
|
||||
index 9f881f0b..47434c89 100644
|
||||
--- a/lib/autoconf/c.m4
|
||||
+++ b/lib/autoconf/c.m4
|
||||
@@ -2749,8 +2749,8 @@ AC_DEFUN([_AC_PROG_CXX_STDCXX_EDITION_TRY],
|
||||
[AC_REQUIRE([_AC_CXX_CXX$1_TEST_PROGRAM])]dnl
|
||||
[AS_IF([test x$ac_prog_cxx_stdcxx = xno],
|
||||
[AC_MSG_CHECKING([for $CXX option to enable C++$1 features])
|
||||
-AC_CACHE_VAL(ac_cv_prog_cxx_$1,
|
||||
-[ac_cv_prog_cxx_$1=no
|
||||
+AC_CACHE_VAL(ac_cv_prog_cxx_cxx$1,
|
||||
+[ac_cv_prog_cxx_cxx$1=no
|
||||
ac_save_CXX=$CXX
|
||||
AC_LANG_CONFTEST([AC_LANG_DEFINES_PROVIDED][$][ac_cxx_conftest_cxx$1_program])
|
||||
for ac_arg in '' m4_normalize(m4_defn([_AC_CXX_CXX$1_OPTIONS]))
|
||||
--
|
||||
2.37.2
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
From a197431414088a417b407b9b20583b2e8f7363bd Mon Sep 17 00:00:00 2001
|
||||
From: Eric Blake <eblake@redhat.com>
|
||||
Date: Thu, 12 Sep 2013 15:11:29 -0600
|
||||
Subject: [PATCH] AC_INIT: add --runstatedir option to configure
|
||||
|
||||
http://lwn.net/Articles/436012/ documents that many distros
|
||||
are now preferring to use /run rather than /var/run for
|
||||
storage of pid files and other per-process temporary files
|
||||
that must not be cleaned out during arbitrary TMPDIR sweeps.
|
||||
As such, the GNU Coding Standards were recently changed to
|
||||
recommend a new configure option to make it easy to choose
|
||||
this directory at configure time. This patch adds support
|
||||
for the option to all configure scripts built by autoconf.
|
||||
|
||||
* general.m4 (_AC_INIT_PARSE_ARGS): Add new directory option.
|
||||
(_AC_INIT_HELP): Document it.
|
||||
* doc/autoconf.texi (Installation Directory Variables): Document
|
||||
new option.
|
||||
(Site Defaults): Mention typical use within a distro.
|
||||
* NEWS: Mention the addition.
|
||||
|
||||
Signed-off-by: Eric Blake <eblake@redhat.com>
|
||||
---
|
||||
NEWS | 5 +++++
|
||||
doc/autoconf.texi | 14 +++++++++++++-
|
||||
lib/autoconf/general.m4 | 13 ++++++++++++-
|
||||
3 files changed, 30 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
|
||||
index 26e7b17..4932067 100644
|
||||
--- a/doc/autoconf.texi
|
||||
+++ b/doc/autoconf.texi
|
||||
@@ -2826,7 +2826,18 @@ usually has a subdirectory per locale.
|
||||
|
||||
@defvar localstatedir
|
||||
@ovindex localstatedir
|
||||
-The directory for installing modifiable single-machine data.
|
||||
+The directory for installing modifiable single-machine data. Content in
|
||||
+this directory typically survives a reboot.
|
||||
+@end defvar
|
||||
+
|
||||
+@defvar runstatedir
|
||||
+@ovindex runstatedir
|
||||
+The directory for installing temporary modifiable single-machine data.
|
||||
+Content in this directory survives as long as the process is running
|
||||
+(such as pid files), as contrasted with @file{/tmp} that may be
|
||||
+periodically cleaned. Conversely, this directory is typically cleaned
|
||||
+on a reboot. By default, this is a subdirectory of
|
||||
+@code{localstatedir}.
|
||||
@end defvar
|
||||
|
||||
@defvar mandir
|
||||
@@ -22606,6 +22617,7 @@ test "$prefix" = NONE && prefix=/usr/share/local/gnu
|
||||
test "$exec_prefix" = NONE && exec_prefix=/usr/local/gnu
|
||||
test "$sharedstatedir" = '$@{prefix@}/com' && sharedstatedir=/var
|
||||
test "$localstatedir" = '$@{prefix@}/var' && localstatedir=/var
|
||||
+test "$runstatedir" = '$@{localstatedir@}/run' && runstatedir=/run
|
||||
|
||||
# Give Autoconf 2.x generated configure scripts a shared default
|
||||
# cache file for feature test results, architecture-specific.
|
||||
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
|
||||
index 70b0168..1ce9922 100644
|
||||
--- a/lib/autoconf/general.m4
|
||||
+++ b/lib/autoconf/general.m4
|
||||
@@ -586,6 +586,7 @@ AC_SUBST([datadir], ['${datarootdir}'])dnl
|
||||
AC_SUBST([sysconfdir], ['${prefix}/etc'])dnl
|
||||
AC_SUBST([sharedstatedir], ['${prefix}/com'])dnl
|
||||
AC_SUBST([localstatedir], ['${prefix}/var'])dnl
|
||||
+AC_SUBST([runstatedir], ['${localstatedir}/run'])dnl
|
||||
AC_SUBST([includedir], ['${prefix}/include'])dnl
|
||||
AC_SUBST([oldincludedir], ['/usr/include'])dnl
|
||||
AC_SUBST([docdir], [m4_ifset([AC_PACKAGE_TARNAME],
|
||||
@@ -812,6 +813,15 @@ do
|
||||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
+ | --runstate | --runstat | --runsta | --runst | --runs \
|
||||
+ | --run | --ru | --r)
|
||||
+ ac_prev=runstatedir ;;
|
||||
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
+ | --run=* | --ru=* | --r=*)
|
||||
+ runstatedir=$ac_optarg ;;
|
||||
+
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
@@ -921,7 +931,7 @@ fi
|
||||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
- libdir localedir mandir
|
||||
+ libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
@@ -1058,6 +1068,7 @@ Fine tuning of the installation directories:
|
||||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
+ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
--
|
||||
1.7.2.5
|
||||
@ -1,64 +0,0 @@
|
||||
From 4c1f7a361f4fd6180b7b46b950e3bfe389b5b831 Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Dubaj <odubaj@redhat.com>
|
||||
Date: Wed, 28 Aug 2019 07:39:50 +0200
|
||||
Subject: [PATCH] Port tests to Bash 5
|
||||
|
||||
* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP):
|
||||
Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when
|
||||
comparing variable space dumps.
|
||||
(AT_CONFIG_CMP): Also ignore LINENO.
|
||||
* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'.
|
||||
|
||||
---
|
||||
tests/local.at | 5 ++++-
|
||||
tests/m4sh.at | 4 ++--
|
||||
2 files changed, 6 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/tests/local.at b/tests/local.at
|
||||
index 40b7318..f3ad2b5 100644
|
||||
--- a/tests/local.at
|
||||
+++ b/tests/local.at
|
||||
@@ -324,7 +324,7 @@ if test -f state-env.before && test -f state-env.after; then
|
||||
[AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC],
|
||||
[GREP|[EF]GREP|SED],
|
||||
[[_@]|.[*#?$].],
|
||||
- [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
|
||||
+ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
|
||||
$act_file ||
|
||||
test $? -eq 1 || echo failed >&2
|
||||
) 2>stderr-$act_file |
|
||||
@@ -381,6 +381,9 @@ do
|
||||
/'\'\\\$\''=/ d
|
||||
/^argv=/ d
|
||||
/^ARGC=/ d
|
||||
+ /^BASH_ARGC=/ d
|
||||
+ /^BASH_ARGV=/ d
|
||||
+ /^LINENO=/ d
|
||||
' $act_file >at_config_vars-$act_file
|
||||
done
|
||||
AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl
|
||||
diff --git a/tests/m4sh.at b/tests/m4sh.at
|
||||
index 4e4da5d..80684ca 100644
|
||||
--- a/tests/m4sh.at
|
||||
+++ b/tests/m4sh.at
|
||||
@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1])
|
||||
# `_oline_', once processed and ran, produces our reference.
|
||||
# We check that we find ourselves by looking at a string which is
|
||||
# available only in the original script: `_oline_'.
|
||||
-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__])
|
||||
+AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__])
|
||||
AT_CHECK([./reference], 0, [stdout])
|
||||
|
||||
# The reference:
|
||||
@@ -264,7 +264,7 @@ mv stdout expout
|
||||
# Be sure to be out of the PATH.
|
||||
AT_CHECK([mkdir test || exit 77])
|
||||
|
||||
-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO])
|
||||
+AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO])
|
||||
AT_CHECK([./test/test-1], 0, [expout])
|
||||
AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)],
|
||||
0, [expout])
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Tue, 29 Jan 2013 13:46:48 -0800
|
||||
Subject: [PATCH] autoscan: port to perl 5.17
|
||||
|
||||
* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a
|
||||
feature that is deprecated in Perl 5.17. Reported by Ray Lauff in
|
||||
<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>.
|
||||
---
|
||||
bin/autoscan.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/bin/autoscan.in b/bin/autoscan.in
|
||||
index 993a750..db1df79 100644
|
||||
--- a/bin/autoscan.in
|
||||
+++ b/bin/autoscan.in
|
||||
@@ -358,7 +358,7 @@ sub scan_sh_file ($)
|
||||
{
|
||||
# Strip out comments and variable references.
|
||||
s/#.*//;
|
||||
- s/\${[^\}]*}//g;
|
||||
+ s/\$\{[^\}]*}//g;
|
||||
s/@[^@]*@//g;
|
||||
|
||||
# Tokens in the code.
|
||||
--
|
||||
2.1.0
|
||||
|
||||
Loading…
Reference in new issue