[arch-commits] Commit in autoconf/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Nov 13 19:36:00 UTC 2019
Date: Wednesday, November 13, 2019 @ 19:36:00
Author: foutrelis
Revision: 368465
archrelease: copy trunk to staging-any
Added:
autoconf/repos/staging-any/
autoconf/repos/staging-any/0001-autoconf-2.69-perl-5.22-autoscan.patch
(from rev 368464, autoconf/trunk/0001-autoconf-2.69-perl-5.22-autoscan.patch)
autoconf/repos/staging-any/0002-autoconf-2.69-perl-5.28.patch
(from rev 368464, autoconf/trunk/0002-autoconf-2.69-perl-5.28.patch)
autoconf/repos/staging-any/0003-autoconf-2.69-libtool-compatibility.patch
(from rev 368464, autoconf/trunk/0003-autoconf-2.69-libtool-compatibility.patch)
autoconf/repos/staging-any/0004-Port-tests-to-Bash-5.patch
(from rev 368464, autoconf/trunk/0004-Port-tests-to-Bash-5.patch)
autoconf/repos/staging-any/PKGBUILD
(from rev 368464, autoconf/trunk/PKGBUILD)
------------------------------------------------+
0001-autoconf-2.69-perl-5.22-autoscan.patch | 28 ++++++++++
0002-autoconf-2.69-perl-5.28.patch | 25 +++++++++
0003-autoconf-2.69-libtool-compatibility.patch | 27 +++++++++
0004-Port-tests-to-Bash-5.patch | 60 +++++++++++++++++++++
PKGBUILD | 63 +++++++++++++++++++++++
5 files changed, 203 insertions(+)
Copied: autoconf/repos/staging-any/0001-autoconf-2.69-perl-5.22-autoscan.patch (from rev 368464, autoconf/trunk/0001-autoconf-2.69-perl-5.22-autoscan.patch)
===================================================================
--- staging-any/0001-autoconf-2.69-perl-5.22-autoscan.patch (rev 0)
+++ staging-any/0001-autoconf-2.69-perl-5.22-autoscan.patch 2019-11-13 19:36:00 UTC (rev 368465)
@@ -0,0 +1,28 @@
+From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at 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
+
Copied: autoconf/repos/staging-any/0002-autoconf-2.69-perl-5.28.patch (from rev 368464, autoconf/trunk/0002-autoconf-2.69-perl-5.28.patch)
===================================================================
--- staging-any/0002-autoconf-2.69-perl-5.28.patch (rev 0)
+++ staging-any/0002-autoconf-2.69-perl-5.28.patch 2019-11-13 19:36:00 UTC (rev 368465)
@@ -0,0 +1,25 @@
+From dfb0659b205e03af62542cd318a9f3253e28c40a Mon Sep 17 00:00:00 2001
+From: Daniel Colascione <dancol at dancol.org>
+Date: Sun, 4 Mar 2018 13:36:55 -0800
+Subject: [PATCH] Fix test suite with modern Perl
+
+---
+ tests/tools.at | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/tools.at b/tests/tools.at
+index a4a7dd7..e9a6240 100644
+--- a/tests/tools.at
++++ b/tests/tools.at
+@@ -1386,7 +1386,7 @@ do
+ funny=`func_sanitize_file_name "$funny"`
+ file=" file $funny"
+ dir=`func_sanitize_dir_name " dir $funny"`
+- TMPDIR=" tmp$dir"
++ TMPDIR="./ tmp$dir"
+ export TMPDIR
+
+ # skip if we cannot create such a file or directory
+--
+1.9.1
+
Copied: autoconf/repos/staging-any/0003-autoconf-2.69-libtool-compatibility.patch (from rev 368464, autoconf/trunk/0003-autoconf-2.69-libtool-compatibility.patch)
===================================================================
--- staging-any/0003-autoconf-2.69-libtool-compatibility.patch (rev 0)
+++ staging-any/0003-autoconf-2.69-libtool-compatibility.patch 2019-11-13 19:36:00 UTC (rev 368465)
@@ -0,0 +1,27 @@
+From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001
+From: Gary V. Vaughan <gary at gnu.org>
+Date: Mon, 03 Nov 2014 06:25:03 +0000
+Subject: tests: avoid spurious test failure with libtool 2.4.3
+
+Based on a report by Bruce Dubbs.
+
+* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the
+older `quote'.
+
+Signed-off-by: Eric Blake <eblake at redhat.com>
+---
+diff --git a/tests/foreign.at b/tests/foreign.at
+index a9dc33c..d4702cd 100644
+--- a/tests/foreign.at
++++ b/tests/foreign.at
+@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore])
+ # Make sure at-path contains something valid, and let the test suite
+ # display it when verbose. And fail, skipping would too easily hide
+ # problems.
+-AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
++AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout])
+ AT_CHECK([test -f "`sed -n 1p stdout`"])
+
+ # Older libtoolize installed everything but install-sh...
+--
+cgit v0.9.0.2
Copied: autoconf/repos/staging-any/0004-Port-tests-to-Bash-5.patch (from rev 368464, autoconf/trunk/0004-Port-tests-to-Bash-5.patch)
===================================================================
--- staging-any/0004-Port-tests-to-Bash-5.patch (rev 0)
+++ staging-any/0004-Port-tests-to-Bash-5.patch 2019-11-13 19:36:00 UTC (rev 368465)
@@ -0,0 +1,60 @@
+From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001
+From: Ondrej Dubaj <odubaj at redhat.com>
+Date: Wed, 28 Aug 2019 07:39:50 +0200
+Subject: [PATCH] Port tests to Bash 5
+
+* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP):
+Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when
+comparing variable space dumps.
+(AT_CONFIG_CMP): Also ignore LINENO.
+* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'.
+---
+ tests/local.at | 5 ++++-
+ tests/m4sh.at | 4 ++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/tests/local.at b/tests/local.at
+index a22958c..852be28 100644
+--- a/tests/local.at
++++ b/tests/local.at
+@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then
+ [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC],
+ [GREP|[EF]GREP|SED],
+ [[_@]|.[*#?$].],
+- [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
++ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \
+ $act_file ||
+ test $? -eq 1 || echo failed >&2
+ ) 2>stderr-$act_file |
+@@ -382,6 +382,9 @@ do
+ /'\'\\\$\''=/ d
+ /^argv=/ d
+ /^ARGC=/ d
++ /^BASH_ARGC=/ d
++ /^BASH_ARGV=/ d
++ /^LINENO=/ d
+ ' $act_file >at_config_vars-$act_file
+ done
+ AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl
+diff --git a/tests/m4sh.at b/tests/m4sh.at
+index e9d70b0..cbdfcb6 100644
+--- a/tests/m4sh.at
++++ b/tests/m4sh.at
+@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1])
+ # `_oline_', once processed and ran, produces our reference.
+ # We check that we find ourselves by looking at a string which is
+ # available only in the original script: `_oline_'.
+-AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__])
++AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__])
+ AT_CHECK([./reference], 0, [stdout])
+
+ # The reference:
+@@ -264,7 +264,7 @@ mv stdout expout
+ # Be sure to be out of the PATH.
+ AT_CHECK([mkdir test || exit 77])
+
+-AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO])
++AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO])
+ AT_CHECK([./test/test-1], 0, [expout])
+ AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)],
+ 0, [expout])
Copied: autoconf/repos/staging-any/PKGBUILD (from rev 368464, autoconf/trunk/PKGBUILD)
===================================================================
--- staging-any/PKGBUILD (rev 0)
+++ staging-any/PKGBUILD 2019-11-13 19:36:00 UTC (rev 368465)
@@ -0,0 +1,63 @@
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=autoconf
+pkgver=2.69
+pkgrel=6
+pkgdesc="A GNU tool for automatically configuring source code"
+arch=('any')
+license=('GPL2' 'GPL3' 'custom')
+url="https://www.gnu.org/software/autoconf"
+groups=('base-devel')
+depends=('awk' 'm4' 'diffutils' 'sh')
+makedepends=('help2man') # needed while perl patch is present
+checkdepends=('gcc-fortran')
+source=(https://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}
+ '0001-autoconf-2.69-perl-5.22-autoscan.patch'
+ '0002-autoconf-2.69-perl-5.28.patch'
+ '0003-autoconf-2.69-libtool-compatibility.patch'
+ '0004-Port-tests-to-Bash-5.patch')
+md5sums=('50f97f4159805e374639a73e2636f22e'
+ 'SKIP'
+ 'aa07afe5a671df25bf1878831702d5b9'
+ 'f450ce6001458d800907e5d4ad8023fb'
+ '87bceda7922ebc2a453568b2ae179e1b'
+ 'd656c3a43462f678cf72848ca16ad6e2')
+validpgpkeys=('71C2CC22B1C4602927D2F3AAA7A16B4A2527436A')
+
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+
+ # fix incompatibility with recent perl
+ patch -p1 -i $srcdir/0001-autoconf-2.69-perl-5.22-autoscan.patch
+ patch -p1 -i $srcdir/0002-autoconf-2.69-perl-5.28.patch
+
+ # fix tesetsuite failures with recent libtool
+ patch -p1 -i $srcdir/0003-autoconf-2.69-libtool-compatibility.patch
+
+ patch -p1 -i $srcdir/0004-Port-tests-to-Bash-5.patch
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make check
+}
+
+package() {
+ cd ${srcdir}/${pkgname}-${pkgver}
+ make DESTDIR=${pkgdir} install
+
+ # license exception
+ install -Dm644 COPYING.EXCEPTION \
+ $pkgdir/usr/share/licenses/autoconf/COPYING.EXCEPTION
+
+ # remove unwanted file
+ rm -f ${pkgdir}/usr/share/info/standards.info
+}
More information about the arch-commits
mailing list