From 637802759f0c145f785027b4eff658cd743a68ef Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 12 Nov 2019 11:27:44 +0300 Subject: [PATCH] parallel: Update to 20191022 --- parallel/0001-support-MSys2.patch | 10 +++++----- parallel/PKGBUILD | 12 +++++------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/parallel/0001-support-MSys2.patch b/parallel/0001-support-MSys2.patch index 8d42d935..11667179 100644 --- a/parallel/0001-support-MSys2.patch +++ b/parallel/0001-support-MSys2.patch @@ -144,7 +144,7 @@ index 8672d83..76c7405 100644 --- old/configure.ac +++ 001/configure.ac @@ -1,4 +1,16 @@ - AC_INIT([parallel], [20190422], [bug-parallel@gnu.org]) + AC_INIT([parallel], [20191022], [bug-parallel@gnu.org]) + +# on MSys2 prefer msys to native programs, especially perl +# native windows perl does not work for the time being @@ -287,14 +287,14 @@ index fd61160..d53bd0c 100644 $cmd = Job::base64_wrap($ps); } @@ -6794,7 +6794,7 @@ sub sct_hpux() { + $cpu->{'cores'} ||= ::qqx(qq{ /usr/bin/mpsched -s 2>&1 | grep 'Locality Domain Count' | awk '{ print \$4 }'}); - chomp($cpu->{'cores'}); - $cpu->{'threads'} = + $cpu->{'threads'} ||= - ::qqx(qq{ /usr/bin/mpsched -s 2>&1 | perl -ne '/Processor Count\\D+(\\d+)/ and print "\$1"'}); + ::qqx(qq{ /usr/bin/mpsched -s 2>&1 | $^X -ne '/Processor Count\\D+(\\d+)/ and print "\$1"'}); + return $cpu; + } - if(grep { /\d/ } values %$cpu) { - # BUG It is not not known how to calculate this @@ -7522,19 +7522,19 @@ sub empty_input_wrapper { exit ($?&127 ? 128+($?&127) : 1+$?>>8) } diff --git a/parallel/PKGBUILD b/parallel/PKGBUILD index ec7a82f1..4b9464a5 100644 --- a/parallel/PKGBUILD +++ b/parallel/PKGBUILD @@ -2,21 +2,19 @@ # Contributor: Niklas Holm pkgname='parallel' -pkgver='20190422' +pkgver='20191022' pkgrel='1' pkgdesc='A shell tool for executing jobs in parallel' arch=('any') url='https://www.gnu.org/software/parallel/' license=('GPL3') depends=('perl') -source=( - "https://ftpmirror.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,".sig"} - "0001-support-MSys2.patch" -) +source=("https://ftpmirror.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.bz2"{,".sig"} + "0001-support-MSys2.patch") validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888') -sha256sums=('b44bedadff56936f05995ca54628a45ff528df5a59e37affb8f2ee00ad2bb475' +sha256sums=('641beea4fb9afccb1969ac0fb43ebc458f375ceb6f7e24970a9aced463e909a9' 'SKIP' - '4c2893c3ec8dc29401cfae909a79c5292d86a264b27b6bdb26391fd0b1d56111') + '88e9724a31e0dbbf7909305708499c28fcb794a9783b057202da5db8d7ade0b1') prepare() { cd "${srcdir}/${pkgname}-${pkgver}"