diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2023-01-19 17:59:37 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-19 17:59:37 +0000 |
| commit | 150a86a9cb006b4800d6517d58532b8a556fec1e (patch) | |
| tree | 0cea769c7bef669c4dfe19e7805593f6f34033fb /sys-cluster/charliecloud | |
| parent | 1cb0dd91756f77b25d6cc22318dc85187ed084cb (diff) | |
gentoo auto-resync : 19:01:2023 - 17:59:37
Diffstat (limited to 'sys-cluster/charliecloud')
| -rw-r--r-- | sys-cluster/charliecloud/Manifest | 3 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/charliecloud-0.30.ebuild | 4 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch | 48 |
3 files changed, 54 insertions, 1 deletions
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index c75bd5c8c9a6..b74e01f1a0ce 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -1,6 +1,7 @@ +AUX charliecloud-0.30-dash.patch 1669 BLAKE2B 4e68576d20800c0682b38f6fd5a1a391b860bb3e925ad0503b376f16e01b2fd341a94a03a3644e0dac475e4722547c2098ebc085c56b9f95f38c9ebe174376f2 SHA512 6312e62cbe2ee188a1c683cce4ecc904f529bd76cbf966aeaf175c2173a7f7a4c5f01a0d09ffde252800e6571d588c9ba91728c1b6049f496c701c34faa7c012 DIST charliecloud-0.29.tar.gz 506974 BLAKE2B 2f5ce5f6addf1abbb3274f8e8a9d33cc7ec73ba275efc4d750806b5fc2358ad9491da453ae4dcad712567b5719a4b179644e630b64fe9c29cfc2525a06e533a0 SHA512 a8f334cf1ac9fa1117b69f1282b74a3bce313b8fd892373dd7cfa642f664fcd623a8e8d2b81aa9757e43f972cd31fca9185e00d2280b40def2c63c725cea7256 DIST charliecloud-0.30.tar.gz 524870 BLAKE2B 0eadb4abda47554117aa657c3335d0ad95c71a3ccae67af000beeb8e375058002821783824142208ab58dcf7a62141d1eee45ac4241fe53cd2b206bbbbbb10b4 SHA512 a7188594482b712521930b141e10a981f7536b979f14c3a206f02895f8404a9095b17fc6764f937bdb466624ca6074cc0cbc84f33d59b4453b55be5691f4fbd4 EBUILD charliecloud-0.29.ebuild 2273 BLAKE2B 3d62d8d4df8209640ad81192cc398f0bc9050aa260a7bca4e2e8acc2ae42107151fbe13014b0a6efb0bbdb81290a5f9fa11b6f0cbd42804aac6c51886b9f1251 SHA512 f1acfaff8bbd55cf41ee715b83c895c9f528f6cf537d850d821a6a1e5531add1eb20aa4143913cbc9d94de282aca605914f6d569f084a8bc88138b343eb66434 -EBUILD charliecloud-0.30.ebuild 2273 BLAKE2B 3d62d8d4df8209640ad81192cc398f0bc9050aa260a7bca4e2e8acc2ae42107151fbe13014b0a6efb0bbdb81290a5f9fa11b6f0cbd42804aac6c51886b9f1251 SHA512 f1acfaff8bbd55cf41ee715b83c895c9f528f6cf537d850d821a6a1e5531add1eb20aa4143913cbc9d94de282aca605914f6d569f084a8bc88138b343eb66434 +EBUILD charliecloud-0.30.ebuild 2317 BLAKE2B c2ba01e0a0a303e800b3f135579e6db27399e03d130e664832c655046b2dba97f556eb9e0453f53fe9104f7edcc3edafa9d112a0fafce2de0d9e8b44ab17ef87 SHA512 9a9eaeb0853976bd1f4f9510a20d22b75d5fad3287545843837273211d077617c2176896b7956fe493e3ca4a63586f7421f07ddcc4ffbc6f4aa8d89d5f659d02 EBUILD charliecloud-9999.ebuild 2273 BLAKE2B 3d62d8d4df8209640ad81192cc398f0bc9050aa260a7bca4e2e8acc2ae42107151fbe13014b0a6efb0bbdb81290a5f9fa11b6f0cbd42804aac6c51886b9f1251 SHA512 f1acfaff8bbd55cf41ee715b83c895c9f528f6cf537d850d821a6a1e5531add1eb20aa4143913cbc9d94de282aca605914f6d569f084a8bc88138b343eb66434 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678 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 + |