SHA256
3
0
forked from pool/autoconf

Accepting request 328272 from home:dimstar:Factory

Fix autoconf-testsuite with perl 5.22

OBS-URL: https://build.opensuse.org/request/show/328272
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/autoconf?expand=0&rev=34
This commit is contained in:
Ismail Dönmez 2015-09-01 10:28:21 +00:00 committed by Git OBS Bridge
parent 18d629a55e
commit 48de42bae7
6 changed files with 49 additions and 0 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 1 08:39:18 UTC 2015 - dimstar@opensuse.org
- Add autoconf-perl-5.17-fixes.patch: autoscan: port to perl 5.17.
-------------------------------------------------------------------
Fri Mar 13 18:15:12 UTC 2015 - mpluskal@suse.com

View File

@ -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 files changed, 1 insertions(+), 1 deletions(-)
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.
--
1.7.2.5

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 1 08:39:18 UTC 2015 - dimstar@opensuse.org
- Add autoconf-perl-5.17-fixes.patch: autoscan: port to perl 5.17.
-------------------------------------------------------------------
Fri Mar 13 18:15:12 UTC 2015 - mpluskal@suse.com

View File

@ -27,6 +27,8 @@ Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz
Source1: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz.sig
Source2: %{name}.keyring
Patch0: autoreconf-ltdl.diff
# PATCH-FIX-UPSTREAM autoconf-perl-5.17-fixes.patch dimstar@opensuse.org -- autoscan: port to perl 5.17 (with perl 5.22, it is now fatal).
Patch1: autoconf-perl-5.17-fixes.patch
BuildRequires: help2man
Requires: info
Requires: m4 >= 1.4.6
@ -52,6 +54,7 @@ only required for the generation of the scripts, not their use.
%prep
%setup -q -n autoconf-%{version}
%patch0
%patch1 -p1
%build
%configure

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Sep 1 08:39:18 UTC 2015 - dimstar@opensuse.org
- Add autoconf-perl-5.17-fixes.patch: autoscan: port to perl 5.17.
-------------------------------------------------------------------
Fri Mar 13 18:15:12 UTC 2015 - mpluskal@suse.com

View File

@ -27,6 +27,8 @@ Source0: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz
Source1: http://ftp.gnu.org/gnu/autoconf/autoconf-%{version}.tar.gz.sig
Source2: %{name}.keyring
Patch0: autoreconf-ltdl.diff
# PATCH-FIX-UPSTREAM autoconf-perl-5.17-fixes.patch dimstar@opensuse.org -- autoscan: port to perl 5.17 (with perl 5.22, it is now fatal).
Patch1: autoconf-perl-5.17-fixes.patch
BuildRequires: help2man
Requires: info
Requires: m4 >= 1.4.6
@ -52,6 +54,7 @@ only required for the generation of the scripts, not their use.
%prep
%setup -q -n autoconf-%{version}
%patch0
%patch1 -p1
%build
%configure