[gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/

["Nicolas Bock" <nicolasbock@gentoo.org>]

commit:     cd55b93e817d7c81a1d4f5290263a664263494ff
Author:     Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Wed Jan 18 19:32:24 2023 +0000
Commit:     Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 13:42:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd55b93e

sys-cluster/charliecloud: Fix for dash as system shell.

Closes: https://bugs.gentoo.org/890873
Closes: https://github.com/gentoo/gentoo/pull/29161
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>

 sys-cluster/charliecloud/charliecloud-0.30.ebuild  |  4 ++
 .../files/charliecloud-0.30-dash.patch             | 48 ++++++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/sys-cluster/charliecloud/charliecloud-0.30.ebuild b/sys-cluster/charliecloud/charliecloud-0.30.ebuild
index db6df71719a9..9ec1de0e9b0a 100644
--- a/sys-cluster/charliecloud/charliecloud-0.30.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.30.ebuild
@@ -48,6 +48,10 @@ DEPEND="
 		net-misc/rsync
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-dash.patch
+)
+
 src_prepare() {
 	default
 	eautoreconf

diff --git a/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch b/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch
new file mode 100644
index 000000000000..ba76e3fee59f
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch
@@ -0,0 +1,48 @@
+From 1fb019b26d54f777ea7a2781f96adec369a25cbc Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Tue, 17 Jan 2023 19:00:11 +0100
+Subject: [PATCH] PR #1538: configure: Remove bashisms, fix dash compatibility
+Bug: https://bugs.gentoo.org/890873
+Bug: https://github.com/hpc/charliecloud/pull/1538
+
++= and |& are not supported by systems using dash as shell.
+---
+ configure.ac | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 683a532..1c878d7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -216,15 +216,15 @@ AC_PROG_CC
+ # Set up CFLAGS.
+ ch_cflags='-std=c99 -Wall'
+ AS_IF([test -n "$lib_libsquashfuse"],
+-      [ch_cflags+=" -I$inc_libsquashfuse -L$lib_libsquashfuse"
++      [ch_cflags="$ch_cflags -I$inc_libsquashfuse -L$lib_libsquashfuse"
+        # Without this, clang fails with "error: argument unused during
+        # compilation" on the -L. GCC ignores it.
+-       ch_cflags+=' -Wno-unused-command-line-argument'])
++       ch_cflags="$ch_cflags -Wno-unused-command-line-argument"])
+ AS_IF([test $use_werror = yes],
+-      [ch_cflags+=' -Werror'])
++      [ch_cflags="$ch_cflags -Werror"])
+
+ AX_CHECK_COMPILE_FLAG([$ch_cflags], [
+-  CFLAGS+=" $ch_cflags"
++  CFLAGS="$CFLAGS $ch_cflags"
+ ], [
+   AC_MSG_ERROR([no suitable C99 compiler found])
+ ])
+@@ -434,7 +434,7 @@ CH_CHECK_VERSION([GIT], [$vmin_git], [--version | cut -d' ' -f3])
+ # DOT
+ vmin_dot=2.30.1
+ AC_CHECK_PROG([DOT], [dot], [dot])
+-CH_CHECK_VERSION([DOT], [$vmin_dot], [dot -V |& cut -d' ' -f5])
++CH_CHECK_VERSION([DOT], [$vmin_dot], [dot -V 2>&1 | cut -d' ' -f5])
+
+ # git2dot
+ vmin_git2dot=0.8.3
+--
+2.38.2
+