| 1 |
commit: c9827ae2965e07be294903a4790b5a9c161ca8ad |
| 2 |
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com> |
| 3 |
AuthorDate: Wed Jun 30 19:48:56 2021 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 8 12:42:22 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9827ae2 |
| 7 |
|
| 8 |
sys-cluster/charliecloud: Fix configure with dash shell. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/799377 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.2 |
| 12 |
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/21489 |
| 14 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 15 |
|
| 16 |
sys-cluster/charliecloud/charliecloud-0.23.ebuild | 1 + |
| 17 |
sys-cluster/charliecloud/charliecloud-0.24.ebuild | 4 ++++ |
| 18 |
.../charliecloud/files/charliecloud-0.24-dash.patch | 17 +++++++++++++++++ |
| 19 |
3 files changed, 22 insertions(+) |
| 20 |
|
| 21 |
diff --git a/sys-cluster/charliecloud/charliecloud-0.23.ebuild b/sys-cluster/charliecloud/charliecloud-0.23.ebuild |
| 22 |
index a210608743e..612b89ec615 100644 |
| 23 |
--- a/sys-cluster/charliecloud/charliecloud-0.23.ebuild |
| 24 |
+++ b/sys-cluster/charliecloud/charliecloud-0.23.ebuild |
| 25 |
@@ -48,6 +48,7 @@ DEPEND=" |
| 26 |
|
| 27 |
PATCHES=( |
| 28 |
"${FILESDIR}"/${PN}-0.22-sphinx-4.patch |
| 29 |
+ "${FILESDIR}"/${PN}-0.24-dash.patch |
| 30 |
) |
| 31 |
|
| 32 |
src_prepare() { |
| 33 |
|
| 34 |
diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild b/sys-cluster/charliecloud/charliecloud-0.24.ebuild |
| 35 |
index ae43a8ed107..d7ab23b9539 100644 |
| 36 |
--- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild |
| 37 |
+++ b/sys-cluster/charliecloud/charliecloud-0.24.ebuild |
| 38 |
@@ -46,6 +46,10 @@ DEPEND=" |
| 39 |
net-misc/rsync |
| 40 |
)" |
| 41 |
|
| 42 |
+PATCHES=( |
| 43 |
+ "${FILESDIR}"/${PN}-0.24-dash.patch |
| 44 |
+) |
| 45 |
+ |
| 46 |
src_prepare() { |
| 47 |
default |
| 48 |
eautoreconf |
| 49 |
|
| 50 |
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch b/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch |
| 51 |
new file mode 100644 |
| 52 |
index 00000000000..f03dc5e5b1a |
| 53 |
--- /dev/null |
| 54 |
+++ b/sys-cluster/charliecloud/files/charliecloud-0.24-dash.patch |
| 55 |
@@ -0,0 +1,17 @@ |
| 56 |
+https://github.com/hpc/charliecloud/pull/1111 |
| 57 |
+ |
| 58 |
+From e540ad8148ba451349f4c4a7f983096ff0f6e60c Mon Sep 17 00:00:00 2001 |
| 59 |
+From: Oliver Freyermuth <o.freyermuth@××××××××××.com> |
| 60 |
+Date: Wed, 30 Jun 2021 21:38:54 +0200 |
| 61 |
+Subject: [PATCH] configure: Remove bashism from squashfuse version check. |
| 62 |
+--- a/configure.ac |
| 63 |
++++ b/configure.ac |
| 64 |
+@@ -380,7 +380,7 @@ CH_CHECK_VERSION([SHELLCHECK], [$vmin_shellcheck], |
| 65 |
+ vmin_squashfuse=0.1.100 # Ubuntu 16.04 (Xenial). CentOS 7 has 0.1.102. |
| 66 |
+ AC_CHECK_PROG([SQUASHFUSE], [squashfuse], [squashfuse]) |
| 67 |
+ CH_CHECK_VERSION([SQUASHFUSE], [$vmin_squashfuse], |
| 68 |
+- [--help |& head -1 | cut -d' ' -f2]) |
| 69 |
++ [--help 2>&1 | head -1 | cut -d' ' -f2]) |
| 70 |
+ |
| 71 |
+ # sudo, generic |
| 72 |
+ # Avoids prompting for password; see https://superuser.com/a/1183480. |
Archives