From a2ec29cbacee5d1e3744c268337aa6dfa435f87a Mon Sep 17 00:00:00 2001 From: andyrtr Date: Wed, 10 Jun 2020 07:08:40 +0000 Subject: [PATCH] db-move: moved automake from [testing] to [core] (any) git-svn-id: file:///srv/repos/svn-packages/svn@388714 eb2447ed-0c53-47e4-bac8-5bc4a241df78 --- automake/repos/core-any/PKGBUILD | 20 +++++--- .../automake-1.15-dejagnu-testcase.patch | 49 ------------------ .../test_vala-mix2.sh.diff | 0 automake/repos/testing-any/PKGBUILD | 51 ------------------- 4 files changed, 12 insertions(+), 108 deletions(-) delete mode 100644 automake/repos/core-any/automake-1.15-dejagnu-testcase.patch rename automake/repos/{testing-any => core-any}/test_vala-mix2.sh.diff (100%) delete mode 100644 automake/repos/testing-any/PKGBUILD diff --git a/automake/repos/core-any/PKGBUILD b/automake/repos/core-any/PKGBUILD index d284e67f1509..0ff73d4f602c 100644 --- a/automake/repos/core-any/PKGBUILD +++ b/automake/repos/core-any/PKGBUILD @@ -4,7 +4,7 @@ pkgname=automake pkgver=1.16.2 -pkgrel=1 +pkgrel=3 pkgdesc="A GNU tool for automatically creating Makefiles" arch=('any') license=('GPL') @@ -13,21 +13,25 @@ groups=('base-devel') depends=('perl' 'bash') makedepends=('autoconf') checkdepends=('dejagnu' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope' - 'python2' 'python-virtualenv') + 'expect' 'ncompress' 'gettext' 'lzip' 'zip' 'sharutils' 'help2man' + # disable TeX tests for now, lots of them fail and need upstream + # fixes for current texlive release + #'texlive-bin' 'texinfo' + 'python' 'python-virtualenv') source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} - automake-1.15-dejagnu-testcase.patch) + test_vala-mix2.sh.diff) sha512sums=('a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b' 'SKIP' - 'fbea84532ebb9210b95d82104ee53d91bcf97e76c2ebad66794c22d8fd205b263dcba6c04aa87273cc40243ce4c5ae97df63417b52f37288167ad2b1aa80fd04') + '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}" - - # fix testsuite issue with resent dejagnu - patch -p1 -i "$srcdir"/automake-1.15-dejagnu-testcase.patch + patch -Np1 -i ../test_vala-mix2.sh.diff } build() { @@ -38,7 +42,7 @@ build() { check() { cd "${srcdir}/${pkgname}-${pkgver}" - make check PYTHON=/usr/bin/python2 + make check } package() { diff --git a/automake/repos/core-any/automake-1.15-dejagnu-testcase.patch b/automake/repos/core-any/automake-1.15-dejagnu-testcase.patch deleted file mode 100644 index 3af46ad16875..000000000000 --- a/automake/repos/core-any/automake-1.15-dejagnu-testcase.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3b86722e504c686d3e825ca8870708cce7580190 Mon Sep 17 00:00:00 2001 -From: Pavel Raiskup -Date: Mon, 27 Jun 2016 23:10:12 +0200 -Subject: [PATCH] tests: fix bug in dejagnu testcase - -This resolves testsuite error: -ERROR: tcl error sourcing ./spanner.test/spanner.exp. -ERROR: couldn't execute "./spanner": no such file or directory - while executing -"spawn $SPANNER" - (file "./spanner.test/spanner.exp" line 2) - invoked from within -"source ./spanner.test/spanner.exp" - ("uplevel" body line 1) - invoked from within -"uplevel #0 source ./spanner.test/spanner.exp" - invoked from within -"catch "uplevel #0 source $test_file_name"" - -.. which was there probably for a very long time, but now with -dejagnu 1.6 the runtest binary started to validly exit with -non-zero status. - -* t/check12.sh (Makefile.am): Also distribute files from -$(DEJATOOL) because otherwise 'runtest' binary fails later during -'make distcheck' because of incomplete list of distributed files. - -Proposed upstream: -http://thread.gmane.org/gmane.comp.sysutils.automake.patches/9941 - ---- - t/check12.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/t/check12.sh b/t/check12.sh -index 0f3928a..306c720 100644 ---- a/t/check12.sh -+++ b/t/check12.sh -@@ -61,6 +61,7 @@ DEJATOOL = hammer spanner - AM_RUNTESTFLAGS = HAMMER=$(srcdir)/hammer SPANNER=$(srcdir)/spanner - EXTRA_DIST += hammer.test/hammer.exp - EXTRA_DIST += spanner.test/spanner.exp -+EXTRA_DIST += $(DEJATOOL) - END - - cat > hammer << 'END' --- -2.7.4 - diff --git a/automake/repos/testing-any/test_vala-mix2.sh.diff b/automake/repos/core-any/test_vala-mix2.sh.diff similarity index 100% rename from automake/repos/testing-any/test_vala-mix2.sh.diff rename to automake/repos/core-any/test_vala-mix2.sh.diff diff --git a/automake/repos/testing-any/PKGBUILD b/automake/repos/testing-any/PKGBUILD deleted file mode 100644 index 0ff73d4f602c..000000000000 --- a/automake/repos/testing-any/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Maintainer: Lukas Fleischer -# Contributor: Allan McRae -# Contributor: judd - -pkgname=automake -pkgver=1.16.2 -pkgrel=3 -pkgdesc="A GNU tool for automatically creating Makefiles" -arch=('any') -license=('GPL') -url="https://www.gnu.org/software/automake" -groups=('base-devel') -depends=('perl' 'bash') -makedepends=('autoconf') -checkdepends=('dejagnu' 'gcc-fortran' 'java-environment' 'vala' 'emacs' 'cscope' - 'expect' 'ncompress' 'gettext' 'lzip' 'zip' 'sharutils' 'help2man' - # disable TeX tests for now, lots of them fail and need upstream - # fixes for current texlive release - #'texlive-bin' 'texinfo' - 'python' 'python-virtualenv') -source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} - test_vala-mix2.sh.diff) -sha512sums=('a4aa0e41ceaa7df5bc303a6004597fb158f4198594017cd2c586fd9f5a29233e081766bf22b7e4ef0d4c8c3d45a8591009427efa319b362922a958ac1ef6e27b' - '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() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --build=$CHOST --prefix=/usr - make -} - -check() { - cd "${srcdir}/${pkgname}-${pkgver}" - make check -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -}