diff options
Diffstat (limited to 'sys-cluster/charliecloud')
| -rw-r--r-- | sys-cluster/charliecloud/Manifest | 7 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/charliecloud-0.24.ebuild | 9 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/charliecloud-0.25.ebuild | 12 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/charliecloud-9999.ebuild | 8 | ||||
| -rw-r--r-- | sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch | 43 |
5 files changed, 67 insertions, 12 deletions
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest index 62aac7b26905..2aa4e5f8cfba 100644 --- a/sys-cluster/charliecloud/Manifest +++ b/sys-cluster/charliecloud/Manifest @@ -1,7 +1,8 @@ AUX charliecloud-0.24-dash.patch 779 BLAKE2B 5062e284c59b63a20e2e291c0674d832fb7a9b0546c4fff515f48bb8944548c6f673db286551f0d16740c38885a3f9ca3a08c60c98bfdc984d958abffd2ddff7 SHA512 111f4db9a39f03710317af68a321ab496930ce4f8dd32ec8b8c47a5e9489d2313f0175d7580d25cb095e86b3d9148262fb4d4a1862c235739e39fc6732eb45bc +AUX charliecloud-0.24-musl-argp.patch 1304 BLAKE2B cefc0e45803a1e82d62e4e7d16d6b39d1a25e76f7750977a6e5f91f48f87b24cc7b3ef2955375343ba122a90646aa3a33cdb3fe2aec06bba9bc6ffa56d85475b SHA512 87e0d73522f9777987e39ec841fd4ca6af62e81b2f73cf02df8590e8a82d8f8cc49ba44242c35fb898d0cdb5044e37f0902efeae4e0c2e4170c8ed15d4df6d31 DIST charliecloud-0.24.tar.gz 420852 BLAKE2B ca55231c74012a678c24133b28e341392865a562653086766e6b5e570744f31ce69d1afa2bbb2cc85d5e52b6ed6e9f42f67187d9998afd3852a10fd4a8ff29d3 SHA512 41f44ef5f12dc35d7972923a84044b7255801705d4fcabf76e675dcb70a9f25422e7d584a7b49135ef2ae5dc1751a39efd84f8eb719653a769b41f46bd558fd2 DIST charliecloud-0.25.tar.gz 454041 BLAKE2B 3a071f3b9fb06ca1db6d3b85a577943fe76440d395fdf1415d5085110db665fb75ee09dc14768d326e7e280e6c20096479e5f62290f7dee46821c356f5f18535 SHA512 a7a35b584dbdd6c6e27188d3555173c44f90c0e44fa685a15a47f47c94f9d76aa46ab80054a7c53e10a7f56bef87696f1db2a0eb8c49a388dbb0da0fe9112a60 -EBUILD charliecloud-0.24.ebuild 2094 BLAKE2B b8cb9d6b8ae0572a4627df81862f306f5fdbe8ad78113138294d7d90ddf1caa76cedd8f08f0712b1eaf4bcf1e0afb2cf41dd0201b53f8684914e347c690f8f9c SHA512 c3fe87c6eb12e77f1ebddff61a3d0dec32cb79f0adb0148008b2b602ad8fd306bb1f200f771d4100672cabc58bf62bc08f9fff3ed541b31949d0b7db2bc92275 -EBUILD charliecloud-0.25.ebuild 2130 BLAKE2B 42cba472329d3ab59052fd0fc3d519dd628c5fbd305ee95c4d6dc190551b3883542ff2702a3a7d6ddaefaa4be303a862e9b2b226f8f6629f22db79e48ce7b4bf SHA512 cea4d863682c065d0477c88daba6760d19f04828327eef6613c3d4ba3b4fb5b05c982641fd9f6b6317a71d96ed2a2b6e65ece2bd5ac8fda248a2a579e087915a -EBUILD charliecloud-9999.ebuild 2130 BLAKE2B 42cba472329d3ab59052fd0fc3d519dd628c5fbd305ee95c4d6dc190551b3883542ff2702a3a7d6ddaefaa4be303a862e9b2b226f8f6629f22db79e48ce7b4bf SHA512 cea4d863682c065d0477c88daba6760d19f04828327eef6613c3d4ba3b4fb5b05c982641fd9f6b6317a71d96ed2a2b6e65ece2bd5ac8fda248a2a579e087915a +EBUILD charliecloud-0.24.ebuild 2181 BLAKE2B 4ac402158a26c0a684fccebe90c6cb64f3154076344cf4e27c49d86d2f1d49a07ece04515b7fdd3c76673008d6d1b41fbfab00410235628ebd8c223694ca11bc SHA512 b38b27dceb7365e5d65f77a0de13d4d45df24f9ed15813d776dae13995b4bb9ac715a6a04dcfde23ede82eebc1441cbec1e847a351e9c22b1144d26caa1e1489 +EBUILD charliecloud-0.25.ebuild 2230 BLAKE2B 767bad4c7b77dbbf6687805b54c17d780ec51bdb09146cd58e8ec60f413ca12cf6232c1ff86fdfe3ebcf6de226d50d28c044296e6606736c89675ea23788d79d SHA512 232deff91ec5bf39cb13725e603edad2f208357581f3215a4ff4f6cc880dc83044bcb9210240a60b5667edefd964b22e6566e823ed38951c390591814c9a7465 +EBUILD charliecloud-9999.ebuild 2175 BLAKE2B 0c62488a7e87e9c25833a20b4c619e8fa97d2586860dbdb80d329fb1b6dc5bbd26edd9c6e1cfb463ba9b627d9f013609d7a05fa5618bc3bf9197863dfca062f2 SHA512 c4e9e68f7c1a73ed6a9778cc29fb4559718742622680c62486b65f3d3a1f22718f1c426bb6b71455805fa7d44735ef72a576d86a0b0e85aff22e17dd2173281f MISC metadata.xml 618 BLAKE2B 5f7dbfdb8a940a534ed97b4bd47b05a271d6454b0584ac29db1c2fb533044a2c6d48b8425399866abd8d2ebea1f41199ea4cf23af1c6f2646d4c35b5b4c104a4 SHA512 df1b817bbabc6b227c9a779677d345b9df259444b943b1ab58d55c860cd79ad8f9d4b382dc6c4de0c5daa955fd694990217a559e897a3b11f7e954c7b54d4678 diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild b/sys-cluster/charliecloud/charliecloud-0.24.ebuild index 969b56a74d47..951128bbb6df 100644 --- a/sys-cluster/charliecloud/charliecloud-0.24.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.24.ebuild @@ -30,7 +30,9 @@ RESTRICT="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS}" +RDEPEND="${PYTHON_DEPS} + elibc_musl? ( sys-libs/argp-standalone ) +" DEPEND=" ch-image? ( $(python_gen_cond_dep ' @@ -48,6 +50,7 @@ DEPEND=" PATCHES=( "${FILESDIR}"/${PN}-0.24-dash.patch + "${FILESDIR}"/${PN}-0.24-musl-argp.patch ) src_prepare() { @@ -72,8 +75,8 @@ src_configure() { pkg_postinst() { elog "Various builders are supported, as alternative to the internal ch-image." - optfeature "Building with Buildah" app-emulation/buildah - optfeature "Building with Docker" app-emulation/docker + optfeature "Building with Buildah" app-containers/buildah + optfeature "Building with Docker" app-containers/docker optfeature "Progress bars during long operations" sys-apps/pv optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools optfeature "Mount and umount squashfs images" sys-fs/squashfuse diff --git a/sys-cluster/charliecloud/charliecloud-0.25.ebuild b/sys-cluster/charliecloud/charliecloud-0.25.ebuild index 747ab7795f94..f54e49ec426d 100644 --- a/sys-cluster/charliecloud/charliecloud-0.25.ebuild +++ b/sys-cluster/charliecloud/charliecloud-0.25.ebuild @@ -30,7 +30,9 @@ RESTRICT="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS}" +RDEPEND="${PYTHON_DEPS} + elibc_musl? ( sys-libs/argp-standalone ) +" DEPEND=" ch-image? ( $(python_gen_cond_dep ' @@ -46,6 +48,10 @@ DEPEND=" net-misc/rsync )" +PATCHES=( + "${FILESDIR}"/${PN}-0.24-musl-argp.patch +) + src_prepare() { default eautoreconf @@ -70,8 +76,8 @@ src_configure() { pkg_postinst() { elog "Various builders are supported, as alternative to the internal ch-image." - optfeature "Building with Buildah" app-emulation/buildah - optfeature "Building with Docker" app-emulation/docker + optfeature "Building with Buildah" app-containers/buildah + optfeature "Building with Docker" app-containers/docker optfeature "Progress bars during long operations" sys-apps/pv optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools optfeature "Mount and umount squashfs images" sys-fs/squashfuse diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild index 747ab7795f94..8a596e2fb8a1 100644 --- a/sys-cluster/charliecloud/charliecloud-9999.ebuild +++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild @@ -30,7 +30,9 @@ RESTRICT="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" -RDEPEND="${PYTHON_DEPS}" +RDEPEND="${PYTHON_DEPS} + elibc_musl? ( sys-libs/argp-standalone ) +" DEPEND=" ch-image? ( $(python_gen_cond_dep ' @@ -70,8 +72,8 @@ src_configure() { pkg_postinst() { elog "Various builders are supported, as alternative to the internal ch-image." - optfeature "Building with Buildah" app-emulation/buildah - optfeature "Building with Docker" app-emulation/docker + optfeature "Building with Buildah" app-containers/buildah + optfeature "Building with Docker" app-containers/docker optfeature "Progress bars during long operations" sys-apps/pv optfeature "Pack and unpack squashfs images" sys-fs/squashfs-tools optfeature "Mount and umount squashfs images" sys-fs/squashfuse diff --git a/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch b/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch new file mode 100644 index 000000000000..71817111cdcd --- /dev/null +++ b/sys-cluster/charliecloud/files/charliecloud-0.24-musl-argp.patch @@ -0,0 +1,43 @@ +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 + |