Date: Saturday, June 6, 2020 @ 20:09:51
Author: andyrtr
Revision: 388388
upgpkg: automake 1.16.2-3: apply upstream suggested fix to pass test
Added:
automake/trunk/test_vala-mix2.sh.diff
Modified:
automake/trunk/PKGBUILD
------------------------+
PKGBUILD | 20 ++++++++++++--------
test_vala-mix2.sh.diff | 22 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-06-06 19:50:23 UTC (rev 388387)
+++ PKGBUILD 2020-06-06 20:09:51 UTC (rev 388388)
@@ -4,7 +4,7 @@
pkgname=automake
pkgver=1.16.2
-pkgrel=2
+pkgrel=3
pkgdesc="A GNU tool for automatically creating Makefiles"
arch=('any')
license=('GPL')
@@ -18,19 +18,23 @@
# fixes for current texlive release
#'texlive-bin' 'texinfo'
'python' 'python-virtualenv')
-source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig}
+ test_vala-mix2.sh.diff)
sha512sums=('a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b'
- 'SKIP')
+ 'SKIP'
+
'e6cc9cb41cfd10cbd4ab0263859bfa8c892112c68a69043601c6d7da7c70300ccfe29b242a597bdf6c00bf14c12c19180eedbd66e80ae2bbea9513e36d999108')
validpgpkeys=('E1622F96D2BB4E58018EEF9860F906016E407573' # Stefano Lattarini
'F2A38D7EEB2B66405761070D0ADEE10094604D37' # Mathieu Lirzin
'155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering
+prepare() {
+ # upstream suggested gcc10 fix for failing test
+ # https://lists.gnu.org/archive/html/bug-automake/2020-06/msg00003.html
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i ../test_vala-mix2.sh.diff
+}
+
build() {
- # revert to behavior before gcc10 to pass tests
- # FAIL t/vala-mix2.sh (exit status: 2)
- # bugreport has been sent upstream
- export CFLAGS="$CFLAGS -fcommon"
-
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --build=$CHOST --prefix=/usr
make
Added: test_vala-mix2.sh.diff
===================================================================
--- test_vala-mix2.sh.diff (rev 0)
+++ test_vala-mix2.sh.diff 2020-06-06 20:09:51 UTC (rev 388388)
@@ -0,0 +1,22 @@
+diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
+index 8e6a214..933a3ff 100644
+--- a/t/vala-mix2.sh
++++ b/t/vala-mix2.sh
+@@ -44,7 +44,7 @@ int main ()
+ END
+
+ cat > foo.h <<'END'
+-int foo;
++extern int foo;
+ int bar (void);
+ int baz (void);
+ END
+@@ -56,7 +56,7 @@ END
+
+ cat > baz.c <<'END'
+ #include "foo.h"
+-extern int foo = 0;
++int foo = 0;
+ int baz (void) { return 0; }
+ END
+
