From 3d67707ab2dcc3937aabf6cf4906c5f56a7b2ed9 Mon Sep 17 00:00:00 2001 From: Štěpán Kasal Date: Nov 26 2009 09:19:18 +0000 Subject: - new upstream version - backported patch: make AC_FUNC_MMAP work with C++ again --- diff --git a/.cvsignore b/.cvsignore index 5129d3e..e71f975 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -autoconf-2.64.tar.xz +autoconf-2.65.tar.xz diff --git a/autoconf.spec b/autoconf.spec index 4f2544d..13a1db2 100644 --- a/autoconf.spec +++ b/autoconf.spec @@ -1,25 +1,32 @@ Summary: A GNU tool for automatically configuring source code Name: autoconf -Version: 2.64 -Release: 2%{?dist} +Version: 2.65 +Release: 1%{?dist} License: GPLv2+ and GFDL Group: Development/Tools Source: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.xz Source1: filter-provides-automake.sh Source2: filter-requires-automake.sh URL: http://www.gnu.org/software/autoconf/ +BuildArch: noarch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + # m4 >= 1.4.6 is required, >= 1.4.13 is recommended: BuildRequires: m4 >= 1.4.13 Requires: m4 >= 1.4.13 BuildRequires: emacs Requires(post): /sbin/install-info Requires(preun): /sbin/install-info -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Bring back an undocumented macro, some projects do use it. -# Committed to Autoconf git soon after 2.64. -Patch1: autoconf_ah_check_header.patch +# for check only: +BuildRequires: automake libtool gcc-gfortran +%if 0%{?fedora} +BuildRequires: erlang +%endif + +# Make AC_FUNC_MMAP work with C++ again. +# Committed to Autoconf git soon after 2.65. +Patch1: autoconf_ac_func_mmap.patch # filter out bogus perl(Autom4te*) dependencies %define _use_internal_dependency_generator 0 @@ -53,10 +60,10 @@ make %check # The following test is failing. -# 182: autotest.at:1197 parallel autotest and signal handling +# 188: autotest.at:1195 parallel autotest and signal handling # In test/autotest.at, under comment "Test PIPE", the exit code written # to file "status" is 0. Report mailed to bug-autoconf. -make check TESTSUITEFLAGS='-181 183-' +make check TESTSUITEFLAGS='-187 189-' %install rm -rf ${RPM_BUILD_ROOT} @@ -88,6 +95,10 @@ fi %doc AUTHORS COPYING ChangeLog NEWS README THANKS TODO %changelog +* Wed Nov 25 2009 Stepan Kasal - 2.65-1 +- new upstream version +- backported patch: make AC_FUNC_MMAP work with C++ again + * Tue Nov 24 2009 Stepan Kasal - 2.64-2 - add back upstream AH_CHECK_HEADERS, backported from upstream fixes some build failures diff --git a/autoconf_ac_func_mmap.patch b/autoconf_ac_func_mmap.patch new file mode 100644 index 0000000..46fe1b1 --- /dev/null +++ b/autoconf_ac_func_mmap.patch @@ -0,0 +1,61 @@ +2009-11-24 Ralf Wildenhues + + Fix AC_FUNC_MMAP regression with C++ compiler in 2.65. + * lib/autoconf/functions.m4 (AC_FUNC_MMAP): Use const char* + for the constant string. Cast void* to char* for assignment. + * NEWS, THANKS: Update. + Report by Michal Čihař. + +diff --git a/NEWS b/NEWS +index b72eb17..32fa957 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,10 @@ + GNU Autoconf NEWS - User visible changes. + ++* Major changes in Autoconf 2.65a (????-??-??) [experimental] ++ Released by ???? ???? ++ ++** AC_FUNC_MMAP works in C++ mode again. Regression introduced in 2.64. ++ + * Major changes in Autoconf 2.65 (2009-11-21) [stable] + Released by Eric Blake, based on git versions 2.64.*. + +diff --git a/THANKS b/THANKS +index b288163..fdd6930 100644 +--- a/THANKS ++++ b/THANKS +@@ -250,6 +250,7 @@ Matthew D. Langston langston@SLAC.Stanford.EDU + Matthew Mueller donut@azstarnet.com + Matthew Woehlke mw_triad@users.sourceforge.net + Matthias Andree matthias.andree@gmx.de ++Michal Čihař nijel@debian.org + Michael Elizabeth Chastain chastain@cygnus.com + Michael Jenning ? + Michael Matz matz@kde.org +diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 +index 6b6e7fc..14a8cb9 100644 +--- a/lib/autoconf/functions.m4 ++++ b/lib/autoconf/functions.m4 +@@ -1258,6 +1258,7 @@ int + main () + { + char *data, *data2, *data3; ++ const char *cdata2; + int i, pagesize; + int fd, fd2; + +@@ -1282,10 +1283,10 @@ main () + fd2 = open ("conftest.txt", O_RDWR | O_CREAT | O_TRUNC, 0600); + if (fd2 < 0) + return 4; +- data2 = ""; +- if (write (fd2, data2, 1) != 1) ++ cdata2 = ""; ++ if (write (fd2, cdata2, 1) != 1) + return 5; +- data2 = mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); ++ data2 = (char *) mmap (0, pagesize, PROT_READ | PROT_WRITE, MAP_SHARED, fd2, 0L); + if (data2 == MAP_FAILED) + return 6; + for (i = 0; i < pagesize; ++i) diff --git a/autoconf_ah_check_header.patch b/autoconf_ah_check_header.patch deleted file mode 100644 index 60d352d..0000000 --- a/autoconf_ah_check_header.patch +++ /dev/null @@ -1,42 +0,0 @@ -2009-07-30 Paolo Bonzini - - Add back AH_CHECK_HEADERS. - * lib/autoconf/general.m4 (AH_CHECK_HEADERS): New. - * NEWS: Create new section. - -diff --git a/NEWS b/NEWS -index fc5730f..7e8a522 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,5 +1,14 @@ - GNU Autoconf NEWS - User visible changes. - -+* Major changes in Autoconf 2.64a (????-??-??) [experimental] -+ Released by ???? ???? -+ -+** The following undocumented autoconf macros, removed in Autoconf 2.64, -+ have been reinstated: -+ AH_CHECK_HEADERS -+ -+ These macros are present only for backwards compatibility purposes. -+ - * Major changes in Autoconf 2.64 (2009-07-26) [stable] - Released by Eric Blake, based on git versions 2.63b.*. - -diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4 -index 21b512c..36c1899 100644 ---- a/lib/autoconf/headers.m4 -+++ b/lib/autoconf/headers.m4 -@@ -253,6 +253,12 @@ m4_define([_AH_CHECK_HEADER], - [Define to 1 if you have the <$1> header file.])]) - - -+# AH_CHECK_HEADERS(HEADER-FILE...) -+# -------------------------------- -+m4_define([AH_CHECK_HEADERS], -+[m4_foreach_w([AC_Header], [$1], [_AH_CHECK_HEADER(m4_defn([AC_Header]))])]) -+ -+ - # AC_CHECK_HEADERS(HEADER-FILE..., - # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND], - # [INCLUDES]) diff --git a/sources b/sources index 5550cdc..f5c6062 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9decdd5c672fd403ea467bb0789bc194 autoconf-2.64.tar.xz +dfb23a46ecb73a0abade39c053a6c5a1 autoconf-2.65.tar.xz