summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Freyermuth <o.freyermuth@googlemail.com>2021-06-30 21:48:56 +0200
committerIonen Wolkens <ionen@gentoo.org>2021-07-08 08:42:22 -0400
commitc9827ae2965e07be294903a4790b5a9c161ca8ad (patch)
treef23e97759d5d3f436ee073e0c902f374e08d81ae /sys-cluster
parentsys-cluster/charliecloud: Drop unnecessary patch from 0.24. (diff)
downloadgentoo-c9827ae2965e07be294903a4790b5a9c161ca8ad.tar.gz
gentoo-c9827ae2965e07be294903a4790b5a9c161ca8ad.tar.bz2
gentoo-c9827ae2965e07be294903a4790b5a9c161ca8ad.zip
sys-cluster/charliecloud: Fix configure with dash shell.
Closes: https://bugs.gentoo.org/799377 Package-Manager: Portage-3.0.20, Repoman-3.0.2 Signed-off-by: Oliver Freyermuth <o.freyermuth@googlemail.com> Closes: https://github.com/gentoo/gentoo/pull/21489 Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/charliecloud/charliecloud-0.23.ebuild1
-rw-r--r--sys-cluster/charliecloud/charliecloud-0.24.ebuild4
-rw-r--r--sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch17
3 files changed, 22 insertions, 0 deletions
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
index a210608743e5..612b89ec6158 100644
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild
@@ -48,6 +48,7 @@ DEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.22-sphinx-4.patch
+ "${FILESDIR}"/${PN}-0.24-dash.patch
)
src_prepare() {
diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
index ae43a8ed1073..d7ab23b95398 100644
--- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
@@ -46,6 +46,10 @@ DEPEND="
net-misc/rsync
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.24-dash.patch
+)
+
src_prepare() {
default
eautoreconf
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch b/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch
new file mode 100644
index 000000000000..f03dc5e5b1aa
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch
@@ -0,0 +1,17 @@
+https://github.com/hpc/charliecloud/pull/1111
+
+From e540ad8148ba451349f4c4a7f983096ff0f6e60c Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Wed, 30 Jun 2021 21:38:54 +0200
+Subject: [PATCH] configure: Remove bashism from squashfuse version check.
+--- a/configure.ac
++++ b/configure.ac
+@@ -380,7 +380,7 @@ CH_CHECK_VERSION([SHELLCHECK], [$vmin_shellcheck],
+ vmin_squashfuse=0.1.100 # Ubuntu 16.04 (Xenial). CentOS 7 has 0.1.102.
+ AC_CHECK_PROG([SQUASHFUSE], [squashfuse], [squashfuse])
+ CH_CHECK_VERSION([SQUASHFUSE], [$vmin_squashfuse],
+- [--help |& head -1 | cut -d' ' -f2])
++ [--help 2>&1 | head -1 | cut -d' ' -f2])
+
+ # sudo, generic
+ # Avoids prompting for password; see https://superuser.com/a/1183480.