[packages/autoconf] - rediff patches, rel 3
baggins
baggins at pld-linux.org
Sun Aug 29 21:36:12 CEST 2021
commit 6910710ca180ab838c1cb8cd476372771e23a01d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Aug 29 21:35:59 2021 +0200
- rediff patches, rel 3
autoconf-AC_EGREP.patch | 9 +++++----
autoconf-mawk.patch | 46 +++++++++++++++++++++++-----------------------
autoconf.spec | 2 +-
3 files changed, 29 insertions(+), 28 deletions(-)
---
diff --git a/autoconf.spec b/autoconf.spec
index d407444..89e009e 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -20,7 +20,7 @@ Summary(ru.UTF-8): GNU autoconf - автоконфигуратор исходн
Summary(uk.UTF-8): GNU autoconf - автоконфігуратор вихідних текстів
Name: autoconf
Version: 2.71
-Release: 2
+Release: 3
License: GPL v2+/v3+
Group: Development/Building
# stable releases:
diff --git a/autoconf-AC_EGREP.patch b/autoconf-AC_EGREP.patch
index 76768a1..3940415 100644
--- a/autoconf-AC_EGREP.patch
+++ b/autoconf-AC_EGREP.patch
@@ -1,6 +1,7 @@
---- autoconf-2.60/lib/autoconf/general.m4.orig 2006-06-16 23:05:41.000000000 +0200
-+++ autoconf-2.60/lib/autoconf/general.m4 2006-06-27 23:05:25.877762000 +0200
-@@ -2326,7 +2326,7 @@
+diff -urNp -x '*.orig' autoconf-2.71.org/lib/autoconf/general.m4 autoconf-2.71/lib/autoconf/general.m4
+--- autoconf-2.71.org/lib/autoconf/general.m4 2021-01-28 21:46:48.000000000 +0100
++++ autoconf-2.71/lib/autoconf/general.m4 2021-08-29 21:35:10.172811932 +0200
+@@ -2775,7 +2775,7 @@ AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])
AS_IF([dnl eval is necessary to expand ac_cpp.
dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell.
(eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
@@ -8,4 +9,4 @@
+dnl Quote first arg to prevent m4 from eating character classes
$EGREP "[$1]" >/dev/null 2>&1],
[$3],
- [$4])dnl
+ [$4])
diff --git a/autoconf-mawk.patch b/autoconf-mawk.patch
index e79f88e..b0fa38e 100644
--- a/autoconf-mawk.patch
+++ b/autoconf-mawk.patch
@@ -1,31 +1,19 @@
-diff -Nur autoconf-2.53.orig/configure autoconf-2.53/configure
---- autoconf-2.53.orig/configure Fri Mar 8 14:09:59 2002
-+++ autoconf-2.53/configure Sat Mar 16 13:12:23 2002
-@@ -1312,7 +1312,7 @@
- echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
+diff -urNp -x '*.orig' autoconf-2.71.org/configure autoconf-2.71/configure
+--- autoconf-2.71.org/configure 2021-01-28 22:06:02.000000000 +0100
++++ autoconf-2.71/configure 2021-08-29 21:35:09.656146150 +0200
+@@ -2277,7 +2277,7 @@ fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ printf "%s\n" "$MKDIR_P" >&6; }
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-
-diff -Nur autoconf-2.53.orig/lib/autoconf/programs.m4 autoconf-2.53/lib/autoconf/programs.m4
---- autoconf-2.53.orig/lib/autoconf/programs.m4 Mon Mar 4 15:34:20 2002
-+++ autoconf-2.53/lib/autoconf/programs.m4 Sat Mar 16 13:11:53 2002
-@@ -258,7 +258,7 @@
-
- # Check for gawk first since it's generally better.
- AC_DEFUN([AC_PROG_AWK],
--[AC_CHECK_PROGS(AWK, gawk mawk nawk awk, )])
-+[AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )])
-
-
- # AC_PROG_INSTALL
---- autoconf-2.65/doc/autoconf.texi.orig 2009-11-05 03:42:15.000000000 +0100
-+++ autoconf-2.65/doc/autoconf.texi 2010-02-21 17:00:33.323563596 +0100
-@@ -3870,10 +3870,10 @@
+diff -urNp -x '*.orig' autoconf-2.71.org/doc/autoconf.texi autoconf-2.71/doc/autoconf.texi
+--- autoconf-2.71.org/doc/autoconf.texi 2021-01-28 21:46:48.000000000 +0100
++++ autoconf-2.71/doc/autoconf.texi 2021-08-29 21:35:09.659479478 +0200
+@@ -4162,10 +4162,10 @@ in some cases whether they support certa
@acindex{PROG_AWK}
@ovindex AWK
@caindex prog_AWK
@@ -37,5 +25,17 @@ diff -Nur autoconf-2.53.orig/lib/autoconf/programs.m4 autoconf-2.53/lib/autoconf
+It tries @code{mawk} first because that is reported to be the
+implementation that our system usually runs. The result can be overridden by setting the
variable @code{AWK} or the cache variable @code{ac_cv_prog_AWK}.
- @end defmac
+ Using this macro is sufficient to avoid the pitfalls of traditional
+diff -urNp -x '*.orig' autoconf-2.71.org/lib/autoconf/programs.m4 autoconf-2.71/lib/autoconf/programs.m4
+--- autoconf-2.71.org/lib/autoconf/programs.m4 2021-01-28 21:46:48.000000000 +0100
++++ autoconf-2.71/lib/autoconf/programs.m4 2021-08-29 21:35:09.656146150 +0200
+@@ -348,7 +348,7 @@ AN_PROGRAM([gawk], [AC_PROG_AWK])
+ AN_PROGRAM([mawk], [AC_PROG_AWK])
+ AN_PROGRAM([nawk], [AC_PROG_AWK])
+ AC_DEFUN([AC_PROG_AWK],
+-[AC_CHECK_PROGS(AWK, gawk mawk nawk awk, )])
++[AC_CHECK_PROGS(AWK, mawk gawk nawk awk, )])
+
+
+ # AC_PROG_EGREP
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/autoconf.git/commitdiff/6910710ca180ab838c1cb8cd476372771e23a01d
More information about the pld-cvs-commit
mailing list