[arch-commits] Commit in autoconf/trunk (2 files)

Allan McRae allan at archlinux.org
Tue Aug 10 21:34:47 EDT 2010


    Date: Tuesday, August 10, 2010 @ 21:34:46
  Author: allan
Revision: 87202

remove old patches

Deleted:
  autoconf/trunk/autoconf-2.66-sizeof.patch
  autoconf/trunk/autoconf-2.66-subdir.patch

----------------------------+
 autoconf-2.66-sizeof.patch |   68 ----------------------------------
 autoconf-2.66-subdir.patch |   85 -------------------------------------------
 2 files changed, 153 deletions(-)

Deleted: autoconf-2.66-sizeof.patch
===================================================================
--- autoconf-2.66-sizeof.patch	2010-08-11 01:31:48 UTC (rev 87201)
+++ autoconf-2.66-sizeof.patch	2010-08-11 01:34:46 UTC (rev 87202)
@@ -1,68 +0,0 @@
-diff --git a/lib/autoconf/types.m4 b/lib/autoconf/types.m4
-index ee07148..9f482da 100644
---- a/lib/autoconf/types.m4
-+++ b/lib/autoconf/types.m4
-@@ -763,7 +763,7 @@ Remove this warning and the `AC_CACHE_CHECK' when you adjust the code.])
- # AC_CHECK_SIZEOF(TYPE, [IGNORED], [INCLUDES = DEFAULT-INCLUDES])
- # ---------------------------------------------------------------
- AC_DEFUN([AC_CHECK_SIZEOF],
--[AS_LITERAL_IF([$1], [],
-+[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [],
- 	       [m4_fatal([$0: requires literal arguments])])]dnl
- [# The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-diff --git a/lib/m4sugar/m4sh.m4 b/lib/m4sugar/m4sh.m4
-index e1d03d9..6fbc9e1 100644
---- a/lib/m4sugar/m4sh.m4
-+++ b/lib/m4sugar/m4sh.m4
-@@ -1779,7 +1779,7 @@ m4_defun_init([AS_TR_SH],
- [_$0(m4_expand([$1]))])
- 
- m4_define([_AS_TR_SH],
--[_AS_LITERAL_IF([$1], [	 ][
-+[_AS_LITERAL_IF([$1], [*][	 ][
- ])([], [$0_INDIR], [$0_LITERAL])([$1])])
- 
- m4_define([_AS_TR_SH_LITERAL],
-@@ -1812,7 +1812,7 @@ m4_defun_init([AS_TR_CPP],
- [_$0(m4_expand([$1]))])
- 
- m4_define([_AS_TR_CPP],
--[_AS_LITERAL_IF([$1], [	 ][
-+[_AS_LITERAL_IF([$1], [*][	 ][
- ])([], [$0_INDIR], [$0_LITERAL])([$1])])
- 
- m4_define([_AS_TR_CPP_LITERAL],
-diff --git a/tests/semantics.at b/tests/semantics.at
-index b703fd4..48136cd 100644
---- a/tests/semantics.at
-+++ b/tests/semantics.at
-@@ -350,7 +350,7 @@ AT_CHECK_MACRO_CROSS([AC_CHECK_ALIGNOF struct],
- [[AC_CHECK_ALIGNOF([struct { char c; }])
- AC_CHECK_ALIGNOF([struct nosuchstruct])
- ]],
--[AT_CHECK([[grep "#define ALIGNOF_STRUCT___CHAR_C___ [^0]" config.h]],
-+[AT_CHECK([[grep "#define ALIGNOF_STRUCT___CHAR_C___ [1-9]" config.h]],
- 	 0, ignore)
- AT_CHECK([[grep "#define ALIGNOF_STRUCT_NOSUCHSTRUCT 0" config.h]],
- 	 0, ignore)
-@@ -379,13 +379,17 @@ AT_CHECK_MACRO_CROSS([AC_CHECK_SIZEOF struct],
- AC_CHECK_SIZEOF([struct x], [], [struct x { char c; int x; };])
- AC_CHECK_SIZEOF([const struct x], [], [struct x { const char *p; int x; };])
- AC_CHECK_SIZEOF([struct nosuchstruct])
-+# Taken from autoconf.texi:Generic Compiler Characteristics.
-+AC_CHECK_SIZEOF([int *])
- ]],
--[AT_CHECK([[grep "#define SIZEOF_STRUCT_X [^0]" config.h]],
-+[AT_CHECK([[grep "#define SIZEOF_STRUCT_X [1-9]" config.h]],
- 	 0, ignore)
--AT_CHECK([[grep "#define SIZEOF_CONST_STRUCT_X [^0]" config.h]],
-+AT_CHECK([[grep "#define SIZEOF_CONST_STRUCT_X [1-9]" config.h]],
- 	 0, ignore)
- AT_CHECK([[grep "#define SIZEOF_STRUCT_NOSUCHSTRUCT 0" config.h]],
- 	 0, ignore)
-+AT_CHECK([[grep "#define SIZEOF_INT_P [1-9]" config.h]],
-+	 0, ignore)
- ])
- 
- 

Deleted: autoconf-2.66-subdir.patch
===================================================================
--- autoconf-2.66-subdir.patch	2010-08-11 01:31:48 UTC (rev 87201)
+++ autoconf-2.66-subdir.patch	2010-08-11 01:34:46 UTC (rev 87202)
@@ -1,85 +0,0 @@
-diff --git a/lib/autoconf/status.m4 b/lib/autoconf/status.m4
-index 52b7a3d..b9e7026 100644
---- a/lib/autoconf/status.m4
-+++ b/lib/autoconf/status.m4
-@@ -1102,7 +1102,7 @@ AC_DEFUN([AC_CONFIG_SUBDIRS],
-   _AC_CONFIG_COMPUTE_DEST(], [))])]dnl
- [m4_append([_AC_LIST_SUBDIRS], [$1], [
- ])]dnl
--[AS_LITERAL_WORD_IF([$1], [],
-+[AS_LITERAL_IF([$1], [],
- 	       [AC_DIAGNOSE([syntax], [$0: you should use literals])])]dnl
- [AC_SUBST([subdirs], ["$subdirs m4_normalize([$1])"])])
- 
-diff --git a/tests/torture.at b/tests/torture.at
-index 5f13874..e7f61ed 100644
---- a/tests/torture.at
-+++ b/tests/torture.at
-@@ -1567,7 +1567,9 @@ AC_ARG_VAR([INNER2], [an inner2 variable])
- AC_OUTPUT
- ]])
- 
--AT_CHECK([autoreconf -Wall -v], [0], [ignore], [ignore])
-+AT_CHECK([autoreconf -Wall -v], [0], [ignore], [stderr])
-+# We should not warn about nonliteral argument to AC_CONFIG_SUBDIRS here.
-+AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [1])
- AT_CHECK([test -f inner/configure])
- AT_CHECK([test -f inner/innermost/configure])
- AT_CHECK([test -f inner/innermost/config.hin])
-@@ -1693,6 +1695,56 @@ AT_CHECK([test -f inner/myfile], 0)
- AT_CLEANUP
- 
- 
-+## ------------------------------- ##
-+## Non-literal AC_CONFIG_SUBDIRS.  ##
-+## ------------------------------- ##
-+
-+AT_SETUP([Non-literal AC_CONFIG_SUBDIRS])
-+AT_KEYWORDS([autoreconf])
-+
-+# We use aclocal (via autoreconf).
-+AT_CHECK([aclocal --version || exit 77], [], [ignore], [ignore])
-+
-+AT_DATA([install-sh], [])
-+AT_DATA([configure.in],
-+[[AC_INIT(GNU Outer, 1.0)
-+
-+my_subdirs=
-+# Taken from autoconf.texi:Subdirectories.
-+if test "x$package_foo_enabled" = xyes; then
-+  my_subdirs="$my_subdirs foo"
-+fi
-+AC_CONFIG_SUBDIRS([$my_subdirs])
-+AC_OUTPUT
-+]])
-+
-+AS_MKDIR_P([foo])
-+
-+AT_DATA([foo/configure],
-+[[#! /bin/sh
-+touch innerfile
-+exit 0
-+]])
-+chmod +x foo/configure
-+
-+# autoreconf should warn without -Wno-syntax, but should not fail without -Werror.
-+AT_CHECK([autoreconf -Werror -v], [1], [ignore], [stderr])
-+AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore])
-+AT_CHECK([autoreconf -v], [0], [ignore], [stderr])
-+AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [0], [ignore])
-+# We cannot assume aclocal won't warn (aclocal-1.9 does not understand -W*
-+# options), so check autoconf only.
-+AT_CHECK([autoconf --force -Wno-syntax], 0, [ignore], [stderr])
-+AT_CHECK([grep 'AC_CONFIG_SUBDIRS:.*literals' stderr], [1])
-+
-+AT_CHECK([./configure $configure_options], [0], [ignore])
-+AT_CHECK([test ! -f foo/innerfile])
-+# Running the outer configure should trigger the inner.
-+AT_CHECK([./configure $configure_options package_foo_enabled=yes], [0], [ignore])
-+AT_CHECK([test -f foo/innerfile])
-+
-+AT_CLEANUP
-+
- 
- ## ----------------- ##
- ## Empty directory.  ##



More information about the arch-commits mailing list