diff --git a/packages/parallel/build.sh b/packages/parallel/build.sh index d6d533c1c..661aa5dc0 100644 --- a/packages/parallel/build.sh +++ b/packages/parallel/build.sh @@ -1,6 +1,7 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/parallel/ TERMUX_PKG_DESCRIPTION="GNU Parallel is a shell tool for executing jobs in parallel using one or more machines" TERMUX_PKG_VERSION=20180222 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SHA256=e81997dbabef18708de30635bd5d05af63395d869452a91c6a047c9c590e9daf TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/parallel/parallel-${TERMUX_PKG_VERSION}.tar.bz2 TERMUX_PKG_DEPENDS="perl" diff --git a/packages/parallel/parallel.patch b/packages/parallel/parallel.patch index 5f89ace50..d1c66dd92 100644 --- a/packages/parallel/parallel.patch +++ b/packages/parallel/parallel.patch @@ -1,7 +1,16 @@ -diff -u -r ../parallel-20160922/src/parallel ./src/parallel ---- ../parallel-20160922/src/parallel 2016-09-22 19:04:53.000000000 -0400 -+++ ./src/parallel 2016-09-26 10:01:43.814429837 -0400 -@@ -1258,11 +1258,11 @@ +diff -uNr parallel-20180222/src/parallel parallel-20180222.mod/src/parallel +--- parallel-20180222/src/parallel 2018-02-22 21:42:51.000000000 +0200 ++++ parallel-20180222.mod/src/parallel 2018-06-21 12:36:46.066728715 +0300 +@@ -1137,7 +1137,7 @@ + if($opt::bug) { ::die_bug("test-bug"); } + $Global::debug = $opt::D; + $Global::shell = $ENV{'PARALLEL_SHELL'} || parent_shell($$) +- || $ENV{'SHELL'} || "/bin/sh"; ++ || $ENV{'SHELL'} || "@TERMUX_PREFIX@/bin/sh"; + if(not which($Global::shell)) { + ::error("Shell '$Global::shell' not found."); + wait_and_exit(255); +@@ -1488,11 +1488,11 @@ $Global::trim = 'n'; $Global::max_jobs_running = 0; $Global::job_already_run = ''; @@ -14,9 +23,18 @@ diff -u -r ../parallel-20160922/src/parallel ./src/parallel + ::warning("\$HOME not set. Using @TERMUX_HOME@."); + $ENV{HOME} = "@TERMUX_HOME@"; } - } + # no warnings to allow for undefined $XDG_* + no warnings 'uninitialized'; +@@ -3411,7 +3411,7 @@ + unlink $stderrname; -@@ -4255,6 +4255,7 @@ + my $pid = ::open3($stdin_fh,$stdout_fh,$stderr_fh, +- $0,qw(--plain --shell /bin/sh --will-cite), @args); ++ $0,qw(--plain --shell @TERMUX_PREFIX@/bin/sh --will-cite), @args); + if(my $writerpid = fork()) { + close $stdin_fh; + @stdout = <$stdout_fh>; +@@ -4758,6 +4758,7 @@ my $bsd = q(ps -o pid,ppid,command -ax); %pid_parentpid_cmd = ( diff --git a/packages/parallel/sem.patch b/packages/parallel/sem.patch index a6da3acf8..465f79056 100644 --- a/packages/parallel/sem.patch +++ b/packages/parallel/sem.patch @@ -1,7 +1,16 @@ -diff -u -r ../parallel-20160222/src/sem ./src/sem ---- ../parallel-20160222/src/sem 2016-02-21 16:24:56.000000000 -0500 -+++ ./src/sem 2016-04-19 16:51:57.450434076 -0400 -@@ -1224,11 +1224,11 @@ +diff -uNr parallel-20180222/src/sem parallel-20180222.mod/src/sem +--- parallel-20180222/src/sem 2018-02-22 21:42:51.000000000 +0200 ++++ parallel-20180222.mod/src/sem 2018-06-21 12:37:26.333395678 +0300 +@@ -1137,7 +1137,7 @@ + if($opt::bug) { ::die_bug("test-bug"); } + $Global::debug = $opt::D; + $Global::shell = $ENV{'PARALLEL_SHELL'} || parent_shell($$) +- || $ENV{'SHELL'} || "/bin/sh"; ++ || $ENV{'SHELL'} || "@TERMUX_PREFIX@/bin/sh"; + if(not which($Global::shell)) { + ::error("Shell '$Global::shell' not found."); + wait_and_exit(255); +@@ -1488,11 +1488,11 @@ $Global::trim = 'n'; $Global::max_jobs_running = 0; $Global::job_already_run = ''; @@ -14,5 +23,14 @@ diff -u -r ../parallel-20160222/src/sem ./src/sem + ::warning("\$HOME not set. Using @TERMUX_HOME@."); + $ENV{HOME} = "@TERMUX_HOME@"; } - } + # no warnings to allow for undefined $XDG_* + no warnings 'uninitialized'; +@@ -3411,7 +3411,7 @@ + unlink $stderrname; + my $pid = ::open3($stdin_fh,$stdout_fh,$stderr_fh, +- $0,qw(--plain --shell /bin/sh --will-cite), @args); ++ $0,qw(--plain --shell @TERMUX_PREFIX@/bin/sh --will-cite), @args); + if(my $writerpid = fork()) { + close $stdin_fh; + @stdout = <$stdout_fh>;