- upstream bugfix release
- all patches dropped, the issues are fixed upstream
This commit is contained in:
Štěpán Kasal
parent
4fc95da875
commit
d4b5518e5d
@ -1 +1 @@
|
||||
autoconf-2.62.tar.bz2
|
||||
autoconf-2.63.tar.bz2
|
||||
|
||||
@ -1,75 +0,0 @@
|
||||
diff -urN autoconf-2.62/ChangeLog autoconf-2.62_new/ChangeLog
|
||||
--- autoconf-2.62/ChangeLog 2008-06-24 15:18:34.000000000 +0200
|
||||
+++ autoconf-2.62_new/ChangeLog 2008-06-24 15:24:35.000000000 +0200
|
||||
@@ -1,3 +1,14 @@
|
||||
+2008-06-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
+
|
||||
+ Fix '#undef variable /* comment */' transform in config headers.
|
||||
+ * lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS_PREPARE): For
|
||||
+ undefined preprocessor macros that are followed by a comment
|
||||
+ in the header template, do not create nested comments in the
|
||||
+ output.
|
||||
+ * tests/torture.at (@%:@define header templates): Extend test.
|
||||
+ * NEWS: Update.
|
||||
+ Report by Karsten Hopp <karsten@redhat.com>.
|
||||
+
|
||||
2008-06-05 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Fix regression in AT_KEYWORDS([Macro]), from 2007-10-18.
|
||||
diff -urN autoconf-2.62/lib/autoconf/status.m4 autoconf-2.62_new/lib/autoconf/status.m4
|
||||
--- autoconf-2.62/lib/autoconf/status.m4 2008-04-06 01:04:48.000000000 +0200
|
||||
+++ autoconf-2.62_new/lib/autoconf/status.m4 2008-06-24 15:21:54.000000000 +0200
|
||||
@@ -832,9 +832,9 @@
|
||||
}
|
||||
split(mac1, mac2, "(") #)
|
||||
macro = mac2[1]
|
||||
+ prefix = substr(line, 1, index(line, defundef) - 1)
|
||||
if (D_is_set[macro]) {
|
||||
# Preserve the white space surrounding the "#".
|
||||
- prefix = substr(line, 1, index(line, defundef) - 1)
|
||||
print prefix "define", macro P[macro] D[macro]
|
||||
next
|
||||
} else {
|
||||
@@ -842,7 +842,7 @@
|
||||
# in the case of _POSIX_SOURCE, which is predefined and required
|
||||
# on some systems where configure will not decide to define it.
|
||||
if (defundef == "undef") {
|
||||
- print "/*", line, "*/"
|
||||
+ print "/*", prefix defundef, macro, "*/"
|
||||
next
|
||||
}
|
||||
}
|
||||
diff -urN autoconf-2.62/NEWS autoconf-2.62_new/NEWS
|
||||
--- autoconf-2.62/NEWS 2008-06-24 15:18:34.000000000 +0200
|
||||
+++ autoconf-2.62_new/NEWS 2008-06-24 15:25:28.000000000 +0200
|
||||
@@ -25,6 +25,9 @@
|
||||
like '__restrict' if the variant spelling is available, as this is
|
||||
more likely to work when mixing C and C++ code.
|
||||
|
||||
+** Config header templates `#undef UNDEFINED /* comment */' do not lead to
|
||||
+ nested comments any more; regression introduced in 2.62.
|
||||
+
|
||||
** AC_CHECK_ALIGNOF's type argument T is now documented better: it must
|
||||
be a string of tokens such that "T y;" is a valid member declaration
|
||||
in a struct.
|
||||
diff -urN autoconf-2.62/tests/torture.at autoconf-2.62_new/tests/torture.at
|
||||
--- autoconf-2.62/tests/torture.at 2008-04-06 01:04:48.000000000 +0200
|
||||
+++ autoconf-2.62_new/tests/torture.at 2008-06-24 15:23:21.000000000 +0200
|
||||
@@ -497,6 +497,8 @@
|
||||
#define str(define) \
|
||||
#define
|
||||
#define stringify(arg) str(arg)
|
||||
+#undef aaa /* with comments */
|
||||
+#undef not_substed /* with comments */
|
||||
]])
|
||||
|
||||
AT_CHECK_AUTOCONF
|
||||
@@ -527,6 +529,8 @@
|
||||
#define str(define) \
|
||||
#define
|
||||
#define stringify(arg) str(arg)
|
||||
+#define aaa AAA
|
||||
+/* #undef not_substed */
|
||||
]])
|
||||
AT_CHECK([cat config.h], 0, expout)
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
diff -ur autoconf-2.62/ChangeLog autoconf-2.62_new/ChangeLog
|
||||
--- autoconf-2.62/ChangeLog 2008-04-06 01:04:49.000000000 +0200
|
||||
+++ autoconf-2.62_new/ChangeLog 2008-07-04 17:40:40.000000000 +0200
|
||||
@@ -1,3 +1,8 @@
|
||||
+2008-07-04 Stepan Kasal <skasal@redhat.com>
|
||||
+
|
||||
+ * lib/autoconf/c.m4 (AC_C_BIGENDIAN): Remove the checks for
|
||||
+ universal binaries, it produced false positives.
|
||||
+
|
||||
2008-06-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
||||
|
||||
Fix '#undef variable /* comment */' transform in config
|
||||
diff -ur autoconf-2.62/lib/autoconf/c.m4 autoconf-2.62_new/lib/autoconf/c.m4
|
||||
--- autoconf-2.62/lib/autoconf/c.m4 2008-04-06 01:04:48.000000000 +0200
|
||||
+++ autoconf-2.62_new/lib/autoconf/c.m4 2008-07-04 17:38:31.000000000 +0200
|
||||
@@ -1407,17 +1407,6 @@
|
||||
#endif])dnl
|
||||
AC_CACHE_CHECK([whether byte ordering is bigendian], [ac_cv_c_bigendian],
|
||||
[ac_cv_c_bigendian=unknown
|
||||
- m4_ifval(m4_ifdef([AH_HEADER], 1)[$4],
|
||||
- [# See if __BIG_ENDIAN__ or __LITTLE_ENDIAN__ is defined.
|
||||
- AC_COMPILE_IFELSE(
|
||||
- [AC_LANG_SOURCE(
|
||||
- [[#if ! (defined __BIG_ENDIAN__ || defined __LITTLE_ENDIAN__)
|
||||
- neither is defined;
|
||||
- #endif
|
||||
- typedef int dummy;
|
||||
- ]])],
|
||||
- [ac_cv_c_bigendian=universal])],
|
||||
- [AC_DIAGNOSE([obsolete], [AC_C_BIGENDIAN suggests AC_CONFIG_HEADERS])])
|
||||
if test $ac_cv_c_bigendian = unknown; then
|
||||
# See if sys/param.h defines the BYTE_ORDER macro.
|
||||
AC_COMPILE_IFELSE(
|
||||
@ -1,100 +0,0 @@
|
||||
Karsten Hopp: modified upstream fix (Changelog)
|
||||
From: Eric Blake <ebb9@byu.net>
|
||||
Date: Thu, 5 Jun 2008 21:18:11 +0000 (-0600)
|
||||
Subject: Fix regression in AT_KEYWORDS([Macro]), from 2007-10-18.
|
||||
X-Git-Url: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff_plain;h=3ac7ceb0c2dfd023e0e9e944da6825b6bd676568
|
||||
|
||||
Fix regression in AT_KEYWORDS([Macro]), from 2007-10-18.
|
||||
|
||||
* lib/autotest/general.m4 (AT_KEYWORDS): Expand argument prior to
|
||||
converting it to lower case.
|
||||
* tests/autotest.at (Keywords and ranges): Test this.
|
||||
* NEWS: Document the fix.
|
||||
* THANKS: Update.
|
||||
Reported by Karsten Hopp.
|
||||
|
||||
Signed-off-by: Eric Blake <ebb9@byu.net>
|
||||
---
|
||||
|
||||
--- a/ChangeLog.orig 2008-04-06 01:04:49.000000000 +0200
|
||||
+++ b/ChangeLog 2008-06-06 11:10:16.000000000 +0200
|
||||
@@ -1,3 +1,13 @@
|
||||
+2008-06-05 Eric Blake <ebb9@byu.net>
|
||||
+
|
||||
+ Fix regression in AT_KEYWORDS([Macro]), from 2007-10-18.
|
||||
+ * lib/autotest/general.m4 (AT_KEYWORDS): Expand argument prior to
|
||||
+ converting it to lower case.
|
||||
+ * tests/autotest.at (Keywords and ranges): Test this.
|
||||
+ * NEWS: Document the fix.
|
||||
+ * THANKS: Update.
|
||||
+ Reported by Karsten Hopp.
|
||||
+
|
||||
2008-04-05 Eric Blake <ebb9@byu.net>
|
||||
|
||||
Release Version 2.62.
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 183d4f1..8b866ad 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -9,6 +9,10 @@ GNU Autoconf NEWS - User visible changes.
|
||||
** Two new quadrigraphs have been introduced: @{:@ for (, and @:}@ for ),
|
||||
allowing the output of unbalanced parantheses in more contexts.
|
||||
|
||||
+** AT_KEYWORDS once again performs expansion on its argument, such that
|
||||
+ AT_KEYWORDS([m4_if([$1], [], [default])]) no longer complains about
|
||||
+ the possibly unexpanded m4_if [regression introduced in 2.62].
|
||||
+
|
||||
|
||||
* Major changes in Autoconf 2.62 (2008-04-05) [stable]
|
||||
Released by Eric Blake, based on git versions 2.61a.*.
|
||||
diff --git a/THANKS b/THANKS
|
||||
index 5ec8921..224cdea 100644
|
||||
--- a/THANKS
|
||||
+++ b/THANKS
|
||||
@@ -177,6 +177,7 @@ Justace Clutter ?
|
||||
Jörn Rennecke amylaar@cygnus.co.uk
|
||||
Karl Berry karl@cs.umb.edu
|
||||
Karl Heuer kwzh@gnu.org
|
||||
+Karsten Hopp karsten@redhat.com
|
||||
Kate Hedstrom ?
|
||||
Kathryn Hargreaves kathryn@deas.harvard.edu
|
||||
Kaveh R. Ghazi ghazi@caip.rutgers.edu
|
||||
diff --git a/lib/autotest/general.m4 b/lib/autotest/general.m4
|
||||
index 88d10a3..993dd9f 100644
|
||||
--- a/lib/autotest/general.m4
|
||||
+++ b/lib/autotest/general.m4
|
||||
@@ -1476,9 +1476,10 @@ m4_case([$1],
|
||||
# AT_KEYWORDS(KEYWORDS)
|
||||
# ---------------------
|
||||
# Declare a list of keywords associated to the current test group.
|
||||
-# The list is stored in lower case, since the -k option is case-insensitive.
|
||||
+# Since the -k option is case-insensitive, the list is stored in lower case
|
||||
+# to avoid duplicates that differ only by case.
|
||||
_AT_DEFINE_SETUP([AT_KEYWORDS],
|
||||
-[m4_append_uniq_w([AT_keywords], m4_tolower([[$1]]))])
|
||||
+[m4_append_uniq_w([AT_keywords], m4_tolower(m4_dquote(m4_expand([$1]))))])
|
||||
|
||||
|
||||
# AT_CAPTURE_FILE(FILE)
|
||||
diff --git a/tests/autotest.at b/tests/autotest.at
|
||||
index dc3cfd5..c4c0eda 100644
|
||||
--- a/tests/autotest.at
|
||||
+++ b/tests/autotest.at
|
||||
@@ -690,7 +690,7 @@ AT_CHECK(:)
|
||||
AT_CLEANUP
|
||||
AT_SETUP(both) # 04
|
||||
AT_KEYWORDS([key1 key2])
|
||||
-AT_KEYWORDS([key1])
|
||||
+AT_KEYWORDS([m4@&t@_echo([Key1])])
|
||||
AT_CHECK(:)
|
||||
AT_CLEANUP
|
||||
AT_SETUP(test5) # 05
|
||||
@@ -713,7 +713,7 @@ AT_CHECK(:)
|
||||
AT_CLEANUP
|
||||
]])
|
||||
dnl check that AT_KEYWORDS does not duplicate words
|
||||
-AT_CHECK([grep 'key1.*key1' k], [1])
|
||||
+AT_CHECK([grep -i 'key1.*key1' k], [1])
|
||||
dnl check that -k requires an argument
|
||||
AT_CHECK([$CONFIG_SHELL ./k -k], [1], [], [ignore])
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
diff -up autoconf-2.62/lib/autoconf/status.m4.multilinevars autoconf-2.62/lib/autoconf/status.m4
|
||||
--- autoconf-2.62/lib/autoconf/status.m4.multilinevars 2008-07-07 11:37:41.000000000 +0200
|
||||
+++ autoconf-2.62/lib/autoconf/status.m4 2008-07-07 11:40:44.000000000 +0200
|
||||
@@ -1360,16 +1360,16 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
# Files that config.status was made for.
|
||||
m4_ifdef([_AC_SEEN_CONFIG(FILES)],
|
||||
-[config_files="$ac_config_files"
|
||||
+[config_files="`echo $ac_config_files`"
|
||||
])dnl
|
||||
m4_ifdef([_AC_SEEN_CONFIG(HEADERS)],
|
||||
-[config_headers="$ac_config_headers"
|
||||
+[config_headers="`echo $ac_config_headers`"
|
||||
])dnl
|
||||
m4_ifdef([_AC_SEEN_CONFIG(LINKS)],
|
||||
-[config_links="$ac_config_links"
|
||||
+[config_links="`echo $ac_config_links`"
|
||||
])dnl
|
||||
m4_ifdef([_AC_SEEN_CONFIG(COMMANDS)],
|
||||
-[config_commands="$ac_config_commands"
|
||||
+[config_commands="`echo $ac_config_commands`"
|
||||
])dnl
|
||||
|
||||
_ACEOF
|
||||
@ -1,18 +1,12 @@
|
||||
Summary: A GNU tool for automatically configuring source code
|
||||
Name: autoconf
|
||||
Version: 2.62
|
||||
Release: 5%{?dist}
|
||||
Version: 2.63
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+ and GFDL
|
||||
Group: Development/Tools
|
||||
Source: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.bz2
|
||||
Source1: filter-provides-automake.sh
|
||||
Source2: filter-requires-automake.sh
|
||||
# This one will be included in 2.63:
|
||||
Patch0: autoconf-2.62-449973.patch
|
||||
Patch1: autoconf-2.62-449245.patch
|
||||
Patch2: autoconf-2.62-449944.patch
|
||||
# Patch for p.e. #449467:
|
||||
Patch3: autoconf-2.62-multilinevars.patch
|
||||
URL: http://www.gnu.org/software/autoconf/
|
||||
BuildRequires: m4 >= 1.4.7, emacs
|
||||
Requires: m4 >= 1.4.7
|
||||
@ -44,10 +38,6 @@ their use.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
# use ./configure here to avoid copying config.{sub,guess} with those from the
|
||||
@ -89,6 +79,10 @@ fi
|
||||
%doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO
|
||||
|
||||
%changelog
|
||||
* Wed Sep 17 2008 Stepan Kasal <skasal@redhat.com> 2.63-1
|
||||
- upstream bugfix release
|
||||
- all patches dropped, the issues are fixed upstream
|
||||
|
||||
* Mon Jul 07 2008 Karsten Hopp <karsten@redhat.com> 2.62-5
|
||||
- fix multiline variables (p.e. #449467)
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user