summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2018-10-12 08:45:43 +0200
committerPavel Raiskup <praiskup@redhat.com>2018-10-12 08:45:43 +0200
commiteaa4b787c139667d35f7826d75fa7baf0bee43c2 (patch)
tree3af0cd2aa9d4b0b48825fe8b7db016556e054372
parent0c226316c4f00aeb4ba93c8b7d151f4aca84b37a (diff)
downloadscl-autotools-eaa4b787c139667d35f7826d75fa7baf0bee43c2.tar.gz
scl-autotools-eaa4b787c139667d35f7826d75fa7baf0bee43c2.tar.xz
scl-autotools-eaa4b787c139667d35f7826d75fa7baf0bee43c2.zip
autotools-latest-autoconf: fixup, enable testsuite
-rw-r--r--repos/autotools/autotools-latest/autoconf/autoconf-2.69-perl-5.22-autoscan.patch28
-rw-r--r--repos/autotools/autotools-latest/autoconf/autoconf.spec40
2 files changed, 54 insertions, 14 deletions
diff --git a/repos/autotools/autotools-latest/autoconf/autoconf-2.69-perl-5.22-autoscan.patch b/repos/autotools/autotools-latest/autoconf/autoconf-2.69-perl-5.22-autoscan.patch
new file mode 100644
index 0000000..7442cad
--- /dev/null
+++ b/repos/autotools/autotools-latest/autoconf/autoconf-2.69-perl-5.22-autoscan.patch
@@ -0,0 +1,28 @@
+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
+
diff --git a/repos/autotools/autotools-latest/autoconf/autoconf.spec b/repos/autotools/autotools-latest/autoconf/autoconf.spec
index e3b1351..eed8eaa 100644
--- a/repos/autotools/autotools-latest/autoconf/autoconf.spec
+++ b/repos/autotools/autotools-latest/autoconf/autoconf.spec
@@ -1,3 +1,6 @@
+# Run extended test
+%bcond_with autoconf_enables_optional_test
+
%{?_compat_el5_build}
%{!?scl:%global scl autotools-latest}
@@ -7,16 +10,19 @@
Summary: A GNU tool for automatically configuring source code
Name: %{?scl_prefix}autoconf
Version: 2.69
-Release: 9%{?dist}
+Release: 11%{?dist}
Group: Development/Tools
License: GPLv2+ and GFDL
Source0: http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.gz
URL: http://www.gnu.org/software/autoconf/
-BuildArch: noarch
+
+Patch1: autoconf-2.69-perl-5.22-autoscan.patch
+
+BuildArch: noarch
# run "make check" by default
-%bcond_with check
+%bcond_without check
# m4 >= 1.4.6 is required, >= 1.4.14 is recommended; We have 1.4.5 in rhel5,
# 1.4.13 in rhel6, so don't build for el5 yet - this requires workaround with
@@ -24,6 +30,7 @@ BuildArch: noarch
# proper way.
BuildRequires: %{?scl_prefix}m4, help2man
Requires: %{?scl_prefix}m4
+BuildRequires: gcc
BuildRequires: emacs
%{?_compat_br_perl_macros}
@@ -40,12 +47,14 @@ BuildRequires: perl-generators
%endif
%if %{with check}
+%if %{with autoconf_enables_optional_test}
# For extended testsuite coverage
BuildRequires: gcc-gfortran
%if 0%{?fedora} >= 15
BuildRequires: erlang
%endif
%endif
+%endif
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -74,33 +83,30 @@ their use.
%prep
%setup -q -n autoconf-%{version}
+%patch1 -p1
%build
%{?scl_enable}
%configure
-# not parallel safe
-make
+%make_build
%{?scl_disable}
%check
%if %{with check}
+# make check # TESTSUITEFLAGS='1-198 200-' # will disable nr. 199.
+# make check TESTSUITEFLAGS="-k \!erlang"
%{?scl_enable}
-make check # TESTSUITEFLAGS='1-198 200-' # will disable nr. 199.
+make check
%{?scl_disable}
%endif
%install
-%_compat_install
-
-%if 0%{?rhel} == 5
-rm -rf %{buildroot}
-%endif
+%{?_compat_install}
%{?scl_enable}
-make install DESTDIR=%{buildroot}
-mkdir -p %{buildroot}/share
+%make_install
%{?scl_disable}
# Don't %%exclude this in %%files as it is not generated on RHEL7
@@ -108,7 +114,7 @@ rm -rf %{buildroot}%{_infodir}/dir
%clean
-%_compat_clean
+%{?_compat_clean}
%post
@@ -133,6 +139,12 @@ fi
%doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
%changelog
+* Fri Oct 12 2018 Pavel Raiskup <praiskup@redhat.com> - 2.69-11
+- install gcc to fix testsuite
+
+* Fri Oct 12 2018 Pavel Raiskup <praiskup@redhat.com> - 2.69-10
+- cleanup, sync with rawhide
+
* Mon Oct 10 2016 Pavel Raiskup <praiskup@redhat.com> - 2.69-9
- BR perl-generators