diff options
Diffstat (limited to 'sys-cluster/charliecloud')
| -rw-r--r-- | sys-cluster/charliecloud/Manifest | 7 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/charliecloud-0.27.ebuild (renamed from sys-cluster/charliecloud/charliecloud-0.25.ebuild) | 12 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/charliecloud-9999.ebuild | 6 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch | 43 |
4 files changed, 11 insertions, 57 deletions
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index 707bbd42b78f..33408b017621 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -1,7 +1,6 @@ -AUX charliecloud-0.24-musl-argp.patch 1304 BLAKE2B cefc0e45803a1e82d62e4e7d16d6b39d1a25e76f7750977a6e5f91f48f87b24cc7b3ef2955375343ba122a90646aa3a33cdb3fe2aec06bba9bc6ffa56d85475b SHA512 87e0d73522f9777987e39ec841fd4ca6af62e81b2f73cf02df8590e8a82d8f8cc49ba44242c35fb898d0cdb5044e37f0902efeae4e0c2e4170c8ed15d4df6d31 -DIST charliecloud-0.25.tar.gz 454041 BLAKE2B 3a071f3b9fb06ca1db6d3b85a577943fe76440d395fdf1415d5085110db665fb75ee09dc14768d326e7e280e6c20096479e5f62290f7dee46821c356f5f18535 SHA512 a7a35b584dbdd6c6e27188d3555173c44f90c0e44fa685a15a47f47c94f9d76aa46ab80054a7c53e10a7f56bef87696f1db2a0eb8c49a388dbb0da0fe9112a60 DIST charliecloud-0.26.tar.gz 472324 BLAKE2B 2b4b8f44f05a497e9367e97e49de255170b610880ef5d7909f7837bc54962f2c2de929d8381b99dc3f4b6124583744993b59839f8f1481cdbd5dc32334d3da9f SHA512 a8638db42a5563723b62ba0e9b9861b41e76b9246b94887d57a8d4c421d9dd2e8c0965b62af166e47859b72a50a2e01ec6775ef13f79c52696a6b2fd95134174 -EBUILD charliecloud-0.25.ebuild 2230 BLAKE2B 767bad4c7b77dbbf6687805b54c17d780ec51bdb09146cd58e8ec60f413ca12cf6232c1ff86fdfe3ebcf6de226d50d28c044296e6606736c89675ea23788d79d SHA512 232deff91ec5bf39cb13725e603edad2f208357581f3215a4ff4f6cc880dc83044bcb9210240a60b5667edefd964b22e6566e823ed38951c390591814c9a7465 +DIST charliecloud-0.27.tar.gz 471754 BLAKE2B b683847a79dd55a4bb79458e94e03988acdff0a1e6a24e7f67d56758bdbc3754cc3609e97bfc778f5cb6ce35d6f4df773235314c2ed642ac796b28b824ecadf6 SHA512 cfa5b1ac923008b9a38fc0228562b31551ea941bf222c9b9e12d8dce4c83ca896893e3509773a5ebc02d6b374d08dc049797226cf1432099aae7174c2bc5ee2b EBUILD charliecloud-0.26-r1.ebuild 2226 BLAKE2B 8ec73950df4519a606096cc14c5092c6547c26874ae28da1e98efb53498ab0725804321b1fc5960891b6ad78c1ecefdd0eac7f52dd9d233c982f7189915227f1 SHA512 76699826a6a5a10420b651317c4b074fd883d1d1ac5562431cdc74cb7997991434c50bc05960b7df51b21d05b09b9257e30e9f336e502c341f531f0ed83838da -EBUILD charliecloud-9999.ebuild 2226 BLAKE2B 8ec73950df4519a606096cc14c5092c6547c26874ae28da1e98efb53498ab0725804321b1fc5960891b6ad78c1ecefdd0eac7f52dd9d233c982f7189915227f1 SHA512 76699826a6a5a10420b651317c4b074fd883d1d1ac5562431cdc74cb7997991434c50bc05960b7df51b21d05b09b9257e30e9f336e502c341f531f0ed83838da +EBUILD charliecloud-0.27.ebuild 2230 BLAKE2B c9b1f02893c06d65118d21f14fbd2fca75cad01c69e15db450239015e38b22572491d2180f299bdce265177f158a62a171605172ecc6a7cf9765eb9e225be8fd SHA512 53811b9e665a81d26d0382e33a09a94a4f027653b7c2003f58607957857d53351fb2d7b37a4f943d92f6d83832db32b72be0bbdd82b7fb3cbea064312e790137 +EBUILD charliecloud-9999.ebuild 2230 BLAKE2B c9b1f02893c06d65118d21f14fbd2fca75cad01c69e15db450239015e38b22572491d2180f299bdce265177f158a62a171605172ecc6a7cf9765eb9e225be8fd SHA512 53811b9e665a81d26d0382e33a09a94a4f027653b7c2003f58607957857d53351fb2d7b37a4f943d92f6d83832db32b72be0bbdd82b7fb3cbea064312e790137 MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678 diff --git a/sys-cluster/charliecloud/charliecloud-0.25.ebuild b/sys-cluster/charliecloud/charliecloud-0.27.ebuild index f54e49ec426d..e3f49d23c4f0 100644 --- a/sys-cluster/charliecloud/charliecloud-0.25.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.27.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8,9,10} ) @@ -48,10 +48,6 @@ DEPEND=" net-misc/rsync )" -PATCHES=( - "${FILESDIR}"/${PN}-0.24-musl-argp.patch -) - src_prepare() { default eautoreconf @@ -65,11 +61,13 @@ src_configure() { # Libdir is used as a libexec-style destination. --libdir="${EPREFIX}"/usr/lib # Attempts to call python-exec directly otherwise. - --with-sphinx-python=${PYTHON} + --with-sphinx-python="${PYTHON}" # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 --enable-buggy-build # Do not use bundled version of dev-python/lark-parser. --disable-bundled-lark + # Use correct shebang. + --with-python="${PYTHON}" ) econf "${econf_args[@]}" } diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild index 14f8aa4a1aa5..e3f49d23c4f0 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 PYTHON_COMPAT=( python3_{8,9,10} ) @@ -61,13 +61,13 @@ src_configure() { # Libdir is used as a libexec-style destination. --libdir="${EPREFIX}"/usr/lib # Attempts to call python-exec directly otherwise. - --with-sphinx-python=${PYTHON} + --with-sphinx-python="${PYTHON}" # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808 --enable-buggy-build # Do not use bundled version of dev-python/lark-parser. --disable-bundled-lark # Use correct shebang. - --with-python=${PYTHON} + --with-python="${PYTHON}" ) econf "${econf_args[@]}" } diff --git a/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch b/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch deleted file mode 100644 index 71817111cdcd..000000000000 --- a/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1832d5ff905b16435efa64e458e2ca2f656f0ab5 Mon Sep 17 00:00:00 2001 -From: Oliver Freyermuth <o.freyermuth@googlemail.com> -Date: Sun, 19 Dec 2021 16:30:27 +0100 -Subject: [PATCH] configure: Add musl compatibility (external argp). - ---- - configure.ac | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 687d4d4..9f708cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -109,6 +109,26 @@ AC_CHECK_LIB([rt], [shm_open], [LIBRT=-lrt], [ - ]) - AC_SUBST([LIBRT]) - -+# argp_parse, needed externally from libargp / argp_standalone e.g. with musl. -+# First, check if available in used libc out of the box. -+AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM( -+ [#include <argp.h>], -+ [int argc=1; char **argv=NULL; argp_parse(0,argc,argv,0,0,0); return 0;] -+ )], -+ [libc_provides_argp="true"], -+ [libc_provides_argp="false"] -+) -+# If libc doesn't provide argp, test for libargp -+if test "$libc_provides_argp" = "false" ; then -+ AC_MSG_WARN("libc does not provide argp") -+ AC_CHECK_LIB([argp], [argp_parse], [have_largp="true"], [have_largp="false"]) -+ if test "$have_largp" = "false"; then -+ AC_MSG_ERROR([*** argp functions not found - install libargp or argp_standalone]) -+ else -+ CH_RUN_LIBS="-largp $CH_RUN_LIBS" -+ fi -+fi - - ## Options - --- -2.32.0 - |