* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/
@ 2019-07-07 18:31 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-07-07 18:31 UTC (permalink / raw
To: gentoo-commits
commit: 82c98494938307bbec93a7399ded30955069e39e
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Wed May 22 20:38:59 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 18:31:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82c98494
sys-cluster/charliecloud: Version bump to 0.9.10
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-cluster/charliecloud/Manifest | 1 +
.../charliecloud/charliecloud-0.9.10.ebuild | 63 ++++++++++++++++++++++
sys-cluster/charliecloud/charliecloud-9999.ebuild | 57 ++++++++------------
.../files/charliecloud-0.9.10-fix-flags.patch | 37 +++++++++++++
.../charliecloud-0.9.10-fix-hardcoded-gcc.patch | 21 ++++++++
5 files changed, 144 insertions(+), 35 deletions(-)
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index dffc8506776..ce19b78c8b8 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,4 +1,5 @@
DIST charliecloud-0.9.1.tar.gz 194937 BLAKE2B 2ef2ee70cee3293ec4f7f589c9a034afa82835981132ea433d720b2a2750df68adb261540c98bc04e7f8904375dd8804819fb3015dc6e65bbe097fa55d558976 SHA512 6a54912ceb3ea99e9d3d1fa8469d7288df0b71872c6cb1d5a4d324f6f84754b7e4804ec1a3c2a30e7dd6377a3b474fea849eb42014f3599ad27a3f6214642a2b
+DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
DIST charliecloud-0.9.3.tar.gz 200507 BLAKE2B debd06bd6158a473d07618bc8fd9ae8c431212eef87699cdd412cf29390e25f6f9e596ac93eb0d663c47ca0b8243cfbcbfc634066f6de03bb673488471e7ef01 SHA512 d312a583438d579ef4ddd6b1d78cc2c6b32e352dad99dcff93f7e0a346aa11fa534091ad6446217bc6fe0dc6d7299d99ffb2c7bb1a441353fd9b2f118ead2c80
DIST charliecloud-0.9.4.tar.gz 205882 BLAKE2B 2e669581ed0d672b4b4658aafeb5b14b67ee4f506459f00e19fc094e468c91763587b0c29ffd3d85ea8d1ab043fde0363baa925923bd20af77082a3a17da22bd SHA512 7ea58a372b1287b8ce38640ce31fdf6a131275807dc8194b1e302f9cfae0e220868f37fa6deb7f263e9f3f52a173f42b0f2f4c2e8f5a2e8699639ee5f680880f
DIST charliecloud-0.9.5.tar.gz 205980 BLAKE2B 9bd7a9817bb394fb4920b0647f0537618b77cdf80a7e4aca74491d041db4c9c60a088c6582cc62a76051393b3ed806819ea851c6fd964390e46f1e1376cca259 SHA512 9e147dec059bc729e7d94496587241e6a4e66c0dbef3dfd8e3d35993cc32555975f6fa9eb5288d7ea14e6d9243fcbfa8020bd1fdaa067d659923ba493b2a70d3
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
new file mode 100644
index 00000000000..fe9cc07e931
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+ S="${WORKDIR}/${P}"
+else
+ SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="doc examples +pv"
+
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ pv? ( sys-apps/pv )
+"
+DEPEND="doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ net-misc/rsync
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/"${PN}-${PV}"-fix-flags.patch
+ "${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
+)
+
+src_compile() {
+ emake
+ use doc && emake -C doc-src
+}
+
+src_install() {
+ emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" LIBEXEC_DIR="libexec/${PF}"
+ if use doc; then
+ local HTML_DOCS=(doc/.)
+ fi
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc -r examples
+ fi
+ rm -rf "${ED}/usr/share/doc/charliecloud" || die
+ einstalldocs
+}
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index f7d1882d07b..a10f56497f1 100644
--- a/sys-cluster/charliecloud/charliecloud-9999.ebuild
+++ b/sys-cluster/charliecloud/charliecloud-9999.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-# User namespaces don't play well with the sandbox.
-RESTRICT="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-single-r1
if [[ ${PV} == "9999" ]] ; then
inherit git-r3
@@ -20,19 +21,23 @@ HOMEPAGE="https://hpc.github.io/charliecloud/"
SLOT="0"
LICENSE="Apache-2.0"
-IUSE="doc examples +pv test"
+IUSE="doc examples +pv"
-RDEPEND=""
-DEPEND="${RDEPEND}
- pv? ( sys-apps/pv )
- doc? ( dev-python/sphinx
- dev-python/sphinx_rtd_theme
- net-misc/rsync )
- test? ( app-arch/pigz )"
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-DOCS=(
- README.rst
-)
+RDEPEND="${PYTHON_DEPS}
+ pv? ( sys-apps/pv )
+"
+DEPEND="doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ net-misc/rsync
+ )"
src_compile() {
emake
@@ -40,28 +45,10 @@ src_compile() {
}
src_install() {
- emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
- if use doc; then
- mv doc html || die
- local HTML_DOCS=(html/.)
- fi
+ emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}"
if use examples; then
- docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
- DOCS+=(examples)
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc -r examples
fi
- rm -rf "${ED}/usr/share/doc/charliecloud" || die
einstalldocs
}
-
-src_test() {
- cd "${S}/test" || die
- export CH_TEST_TARDIR="${T}/tarballs"
- export CH_TEST_IMGDIR="${T}/images"
-
- # Do not run tests requiring root.
- export CH_TEST_PERMDIRS="skip"
- export CH_TEST_SKIP_DOCKER=yes
- sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
-
- emake test-quick
-}
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch
new file mode 100644
index 00000000000..24f2f2d7253
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch
@@ -0,0 +1,37 @@
+From f0b867bb3bb527150e86a891c0c84dff3acc39e8 Mon Sep 17 00:00:00 2001
+From: Peter Wienemann <wienemann@physik.uni-bonn.de>
+Date: Mon, 1 Jul 2019 19:17:25 +0200
+Subject: [PATCH] PR #462 from @wiene: Add missing compiler flags for examples
+
+This patch ensures that CFLAGS, CPPFLAGS and LDFLAGS settings are
+respected when compiling/linking (lib)sotest, pivot_root and userns.
+---
+ examples/syscalls/Makefile | 2 +-
+ test/Makefile | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/examples/syscalls/Makefile b/examples/syscalls/Makefile
+index 4dbef21b..177ab42a 100644
+--- a/examples/syscalls/Makefile
++++ b/examples/syscalls/Makefile
+@@ -10,4 +10,4 @@ clean:
+ $(BINS): Makefile
+
+ %: %.c
+- gcc $(CFLAGS) $< -o $@
++ gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
+diff --git a/test/Makefile b/test/Makefile
+index 50f24596..97a9316b 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -81,8 +81,8 @@ sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0
+ # the container. (Issue #227.)
+
+ sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0
+- gcc -o $@ -L./sotest -lsotest $^
++ gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
+ sotest/libsotest.so.1.0: sotest/libsotest.c
+- gcc -o $@ -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
++ gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
+ ln -f -s libsotest.so.1.0 sotest/libsotest.so
+ ln -f -s libsotest.so.1.0 sotest/libsotest.so.1
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch
new file mode 100644
index 00000000000..5654e71da5a
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch
@@ -0,0 +1,21 @@
+From d42f3201bb91c582d4533c732e167961030091f9 Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Sat, 6 Jul 2019 17:01:06 +0200
+Subject: [PATCH] examples/syscall/Makefile: Fix hardcoded call to gcc.
+
+To be open for choice of different C compilers,
+honour CC variable.
+---
+ examples/syscalls/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/syscalls/Makefile b/examples/syscalls/Makefile
+index 177ab42a..7dc9a4b8 100644
+--- a/examples/syscalls/Makefile
++++ b/examples/syscalls/Makefile
+@@ -10,4 +10,4 @@ clean:
+ $(BINS): Makefile
+
+ %: %.c
+- gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
++ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/
@ 2019-07-18 8:00 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2019-07-18 8:00 UTC (permalink / raw
To: gentoo-commits
commit: d9410e9ab65866de556b845fe4837568d86637e1
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Tue Jul 16 21:50:38 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 07:58:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9410e9a
sys-cluster/charliecloud: Version bump to 0.10
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-cluster/charliecloud/Manifest | 1 +
sys-cluster/charliecloud/charliecloud-0.10.ebuild | 59 ++++++++++++++++++++++
.../charliecloud-0.10-fix-hardcoded-gcc.patch | 45 +++++++++++++++++
3 files changed, 105 insertions(+)
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 78d4915c65c..80b5b98868b 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,2 +1,3 @@
+DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
diff --git a/sys-cluster/charliecloud/charliecloud-0.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.10.ebuild
new file mode 100644
index 00000000000..fdf652c5e31
--- /dev/null
+++ b/sys-cluster/charliecloud/charliecloud-0.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit python-single-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
+ S="${WORKDIR}/${P}"
+else
+ SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
+HOMEPAGE="https://hpc.github.io/charliecloud/"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+IUSE="doc examples +pv"
+
+# Extensive test suite exists, but downloads container images
+# directly and via Docker and installs packages inside using apt/yum.
+# Additionally, clashes with portage namespacing and sandbox.
+RESTRICT="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+ pv? ( sys-apps/pv )
+"
+DEPEND="doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ net-misc/rsync
+ )"
+
+PATCHES=(
+ # See upstream bug: https://github.com/hpc/charliecloud/pull/481/
+ "${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
+)
+
+src_compile() {
+ emake
+ use doc && emake -C doc-src
+}
+
+src_install() {
+ emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" LIBEXEC_DIR="libexec/${PF}"
+ if use examples; then
+ docompress -x "/usr/share/doc/${PF}/examples"
+ dodoc -r examples
+ fi
+ einstalldocs
+}
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch
new file mode 100644
index 00000000000..07e72b2fbd3
--- /dev/null
+++ b/sys-cluster/charliecloud/files/charliecloud-0.10-fix-hardcoded-gcc.patch
@@ -0,0 +1,45 @@
+From bae9f01ed5ad0ef5d6c0b48cbc1a7fde73ae45ae Mon Sep 17 00:00:00 2001
+From: Oliver Freyermuth <o.freyermuth@googlemail.com>
+Date: Mon, 15 Jul 2019 18:36:24 +0200
+Subject: [PATCH] test/Makefile: Remove hardcoded call to gcc, error out if
+ CC=icc.
+
+---
+ test/Makefile | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 97a9316b..7c28ce2a 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -10,7 +10,7 @@ images_eg := $(sort $(wildcard ../examples/*/*/Build)) \
+ $(sort $(wildcard ../examples/*/*/Docker_Pull)) \
+ $(sort $(wildcard ../examples/*/*/Docker_Pull.*))
+ images := $(images_ch) $(images_eg)
+-sotests := sotest/bin/sotest sotest/lib/libsotest.so.1.0
++sotests := check-no-icc sotest/bin/sotest sotest/lib/libsotest.so.1.0
+
+ # Favor embedded Bats, if installed, over system Bats.
+ export PATH := $(CURDIR)/bats/bin:$(PATH)
+@@ -76,13 +76,18 @@ sotest/bin/sotest: sotest/sotest
+ sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0
+ cp -a $^ $@
+
+-# We hardcode gcc here because some other compilers (hello, Intel) link the
++# We exclude icc here because it links the
+ # resulting binaries with extra shared libraries that are then not copied into
+ # the container. (Issue #227.)
+
++check-no-icc:
++ifeq ($(patsubst %icc,,$(lastword $(CC))),)
++ $(error ICC not supported since it overlinks extra shared libraries)
++endif
++
+ sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0
+- gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
++ $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
+ sotest/libsotest.so.1.0: sotest/libsotest.c
+- gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
++ $(CC) -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
+ ln -f -s libsotest.so.1.0 sotest/libsotest.so
+ ln -f -s libsotest.so.1.0 sotest/libsotest.so.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/
@ 2020-06-14 14:05 Joonas Niilola
0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2020-06-14 14:05 UTC (permalink / raw
To: gentoo-commits
commit: 8902aacc01f97569d832e9d294e7a1932387def8
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sat May 23 17:22:21 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 14:05:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8902aacc
sys-cluster/charliecloud: Drop old.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/15933
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
sys-cluster/charliecloud/Manifest | 2 -
.../charliecloud/charliecloud-0.9.10.ebuild | 66 ---------------------
sys-cluster/charliecloud/charliecloud-0.9.6.ebuild | 67 ----------------------
.../files/charliecloud-0.9.10-fix-flags.patch | 37 ------------
.../charliecloud-0.9.10-fix-hardcoded-gcc.patch | 21 -------
5 files changed, 193 deletions(-)
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index b9b8507c4b5..058daaccdd3 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,5 +1,3 @@
DIST charliecloud-0.10.tar.gz 301083 BLAKE2B be0c650bebc12fd047b1afc61588b4b9cfc0d0addfddb808765d8e125c70329d6c06a86144b4167e5abaf64392ad1891319aabd2ba8fb528de2d9789d040fc0c SHA512 681e2f30f730b42b55b4097dba78e41924b17990354b866e04e09e6d2e4bb584211c130f9a04619dcdd38f2a3eaaad7615ee5ec20a266ee2332b0a512492331f
DIST charliecloud-0.15.tar.gz 346718 BLAKE2B a3710814864904c5db282d092f64faf9a11aeea016c788ee4be62f11257b5b5200d0c1887150b93f18446034d7919df933d3badcf33907a81c0b33e65a5e9f78 SHA512 70f6c9a18f613d05396eda5d41044ec699cf6366ae1bf43839275e62ac317231bb1c3278469040faa03af007260d84e2d718c0fb3fb45e6ace8fb733c6275a84
DIST charliecloud-0.16.tar.gz 356118 BLAKE2B 72e7640feb23fbc55c515fd841cf90562b7800a83673b6a786c8162229b6714ed6a98d3c5066e42ce75a58935e085e86e42ae927cd5f14e6e54ffe6e9863629e SHA512 bf37b5ea2d139635f3207475497bd90595ce625ce9ad05eef5fcd19ec3252e4843eba2bd457587cd9c4ab860aa1e40ec01ac5cd073414bb5a4f89b5c4488bceb
-DIST charliecloud-0.9.10.tar.gz 275687 BLAKE2B e03c3358dd4e5eb88f9c5a3002366c79563e15d5d7792dd55f2800a001b847c13443fce0689a850aa7e6a0aa510c3f6b53d93a88a6f79326eac27acc9cbe2c57 SHA512 93a6f0c6bcceb54fabbc179b960a0d03f1b3547786ce8d502552ddc571475ea2110d6aa290ce5c245be6e2c7cdc47d3f23ff7e74558f684b4a27358aa0971a61
-DIST charliecloud-0.9.6.tar.gz 205380 BLAKE2B 2e95f5486ea6d2306512378290cd29114bc688717741436ae9cc8c1dd2679c22ab21059574d62222cd14063bacecc6a7005b216cd9e2ed01fe1593a3b69871b0 SHA512 55af3e57ef6c2b81ae10bd50d149872af50d508392b271bdaa75cf3b655659ec7da5016a9deeea15aaa20e265e8066d1ed982c122cb5e62ee6d47f25d367410f
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
deleted file mode 100644
index 042093fc108..00000000000
--- a/sys-cluster/charliecloud/charliecloud-0.9.10.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
- S="${WORKDIR}/${P}"
-else
- SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc examples +pv"
-
-# Extensive test suite exists, but downloads container images
-# directly and via Docker and installs packages inside using apt/yum.
-# Additionally, clashes with portage namespacing and sandbox.
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- pv? ( sys-apps/pv )
-"
-DEPEND="
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_MULTI_USEDEP}]
- dev-python/sphinx_rtd_theme[${PYTHON_MULTI_USEDEP}]
- ')
- net-misc/rsync
- )"
-
-PATCHES=(
- "${FILESDIR}"/"${PN}-${PV}"-fix-flags.patch
- "${FILESDIR}"/"${PN}-${PV}"-fix-hardcoded-gcc.patch
-)
-
-src_compile() {
- emake
- use doc && emake -C doc-src
-}
-
-src_install() {
- emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}" LIBEXEC_DIR="libexec/${PF}"
- if use doc; then
- local HTML_DOCS=(doc/.)
- fi
- if use examples; then
- docompress -x "/usr/share/doc/${PF}/examples"
- dodoc -r examples
- fi
- rm -rf "${ED}/usr/share/doc/charliecloud" || die
- einstalldocs
-}
diff --git a/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild b/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
deleted file mode 100644
index 3fd8f0d7646..00000000000
--- a/sys-cluster/charliecloud/charliecloud-0.9.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# User namespaces don't play well with the sandbox.
-RESTRICT="test"
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
- S="${WORKDIR}/${P}"
-else
- SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="doc examples +pv test"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
- pv? ( sys-apps/pv )
- doc? ( dev-python/sphinx
- dev-python/sphinx_rtd_theme
- net-misc/rsync )
- test? ( app-arch/pigz )"
-
-DOCS=(
- README.rst
-)
-
-src_compile() {
- emake
- use doc && emake -C doc-src
-}
-
-src_install() {
- emake install PREFIX="${EPREFIX}/usr" DESTDIR="${ED}"
- if use doc; then
- mv doc html || die
- local HTML_DOCS=(html/.)
- fi
- if use examples; then
- docompress -x "${EPREFIX}/usr/share/doc/${PF}/examples"
- DOCS+=(examples)
- fi
- rm -rf "${ED}/usr/share/doc/charliecloud" || die
- einstalldocs
-}
-
-src_test() {
- cd "${S}/test" || die
- export CH_TEST_TARDIR="${T}/tarballs"
- export CH_TEST_IMGDIR="${T}/images"
-
- # Do not run tests requiring root.
- export CH_TEST_PERMDIRS="skip"
- export CH_TEST_SKIP_DOCKER=yes
- sed -i 's/CHTEST_HAVE_SUDO=yes/CHTEST_HAVE_SUDO=no/' "${S}/test/common.bash" || die
-
- emake test-quick
-}
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch
deleted file mode 100644
index 24f2f2d7253..00000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-flags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f0b867bb3bb527150e86a891c0c84dff3acc39e8 Mon Sep 17 00:00:00 2001
-From: Peter Wienemann <wienemann@physik.uni-bonn.de>
-Date: Mon, 1 Jul 2019 19:17:25 +0200
-Subject: [PATCH] PR #462 from @wiene: Add missing compiler flags for examples
-
-This patch ensures that CFLAGS, CPPFLAGS and LDFLAGS settings are
-respected when compiling/linking (lib)sotest, pivot_root and userns.
----
- examples/syscalls/Makefile | 2 +-
- test/Makefile | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/examples/syscalls/Makefile b/examples/syscalls/Makefile
-index 4dbef21b..177ab42a 100644
---- a/examples/syscalls/Makefile
-+++ b/examples/syscalls/Makefile
-@@ -10,4 +10,4 @@ clean:
- $(BINS): Makefile
-
- %: %.c
-- gcc $(CFLAGS) $< -o $@
-+ gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
-diff --git a/test/Makefile b/test/Makefile
-index 50f24596..97a9316b 100644
---- a/test/Makefile
-+++ b/test/Makefile
-@@ -81,8 +81,8 @@ sotest/lib/libsotest.so.1.0: sotest/libsotest.so.1.0
- # the container. (Issue #227.)
-
- sotest/sotest: sotest/sotest.c sotest/libsotest.so.1.0
-- gcc -o $@ -L./sotest -lsotest $^
-+ gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -L./sotest -lsotest $^
- sotest/libsotest.so.1.0: sotest/libsotest.c
-- gcc -o $@ -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
-+ gcc -o $@ $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -shared -fPIC -Wl,-soname,libsotest.so.1 -lc $^
- ln -f -s libsotest.so.1.0 sotest/libsotest.so
- ln -f -s libsotest.so.1.0 sotest/libsotest.so.1
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch b/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch
deleted file mode 100644
index 5654e71da5a..00000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.9.10-fix-hardcoded-gcc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From d42f3201bb91c582d4533c732e167961030091f9 Mon Sep 17 00:00:00 2001
-From: Oliver Freyermuth <o.freyermuth@googlemail.com>
-Date: Sat, 6 Jul 2019 17:01:06 +0200
-Subject: [PATCH] examples/syscall/Makefile: Fix hardcoded call to gcc.
-
-To be open for choice of different C compilers,
-honour CC variable.
----
- examples/syscalls/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/examples/syscalls/Makefile b/examples/syscalls/Makefile
-index 177ab42a..7dc9a4b8 100644
---- a/examples/syscalls/Makefile
-+++ b/examples/syscalls/Makefile
-@@ -10,4 +10,4 @@ clean:
- $(BINS): Makefile
-
- %: %.c
-- gcc $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
-+ $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/
@ 2021-12-21 1:56 Sam James
0 siblings, 0 replies; 6+ messages in thread
From: Sam James @ 2021-12-21 1:56 UTC (permalink / raw
To: gentoo-commits
commit: 5dfd04eec175ce8a022c6adb8c287b89b81f0abe
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Sun Dec 19 15:37:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 01:54:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dfd04ee
sys-cluster/charliecloud: Add argp compat on musl systems.
Patch also submitted to upstream:
https://github.com/hpc/charliecloud/pull/1258
Closes: https://bugs.gentoo.org/829607
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/23420
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-cluster/charliecloud/charliecloud-0.24.ebuild | 5 ++-
sys-cluster/charliecloud/charliecloud-0.25.ebuild | 8 +++-
sys-cluster/charliecloud/charliecloud-9999.ebuild | 4 +-
.../files/charliecloud-0.24-musl-argp.patch | 43 ++++++++++++++++++++++
4 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/sys-cluster/charliecloud/charliecloud-0.24.ebuild b/sys-cluster/charliecloud/charliecloud-0.24.ebuild
index ad6833306501..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() {
diff --git a/sys-cluster/charliecloud/charliecloud-0.25.ebuild b/sys-cluster/charliecloud/charliecloud-0.25.ebuild
index 1d092db33c89..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
diff --git a/sys-cluster/charliecloud/charliecloud-9999.ebuild b/sys-cluster/charliecloud/charliecloud-9999.ebuild
index 1d092db33c89..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 '
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
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/
@ 2023-01-19 13:42 Nicolas Bock
0 siblings, 0 replies; 6+ messages in thread
From: Nicolas Bock @ 2023-01-19 13:42 UTC (permalink / raw
To: gentoo-commits
commit: cd55b93e817d7c81a1d4f5290263a664263494ff
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Wed Jan 18 19:32:24 2023 +0000
Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 13:42:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd55b93e
sys-cluster/charliecloud: Fix for dash as system shell.
Closes: https://bugs.gentoo.org/890873
Closes: https://github.com/gentoo/gentoo/pull/29161
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>
sys-cluster/charliecloud/charliecloud-0.30.ebuild | 4 ++
.../files/charliecloud-0.30-dash.patch | 48 ++++++++++++++++++++++
2 files changed, 52 insertions(+)
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
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/
@ 2023-06-13 20:50 Nicolas Bock
0 siblings, 0 replies; 6+ messages in thread
From: Nicolas Bock @ 2023-06-13 20:50 UTC (permalink / raw
To: gentoo-commits
commit: a0e54d6e11198e5f0ee5b0ea54a35c14c4dd03a8
Author: Oliver Freyermuth <o.freyermuth <AT> googlemail <DOT> com>
AuthorDate: Fri Jun 9 21:20:42 2023 +0000
Commit: Nicolas Bock <nicolasbock <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 20:50:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0e54d6e
sys-cluster/charliecloud: drop 0.30, 0.31-r1
Closes: https://github.com/gentoo/gentoo/pull/31368
Signed-off-by: Oliver Freyermuth <o.freyermuth <AT> googlemail.com>
Signed-off-by: Nicolas Bock <nicolasbock <AT> gentoo.org>
sys-cluster/charliecloud/Manifest | 2 -
sys-cluster/charliecloud/charliecloud-0.30.ebuild | 87 --------------------
.../charliecloud/charliecloud-0.31-r1.ebuild | 92 ----------------------
.../files/charliecloud-0.30-dash.patch | 48 -----------
.../files/charliecloud-0.31-realpath_return.patch | 32 --------
5 files changed, 261 deletions(-)
diff --git a/sys-cluster/charliecloud/Manifest b/sys-cluster/charliecloud/Manifest
index 9f2cee84c677..739845db48d5 100644
--- a/sys-cluster/charliecloud/Manifest
+++ b/sys-cluster/charliecloud/Manifest
@@ -1,4 +1,2 @@
-DIST charliecloud-0.30.tar.gz 524870 BLAKE2B 0eadb4abda47554117aa657c3335d0ad95c71a3ccae67af000beeb8e375058002821783824142208ab58dcf7a62141d1eee45ac4241fe53cd2b206bbbbbb10b4 SHA512 a7188594482b712521930b141e10a981f7536b979f14c3a206f02895f8404a9095b17fc6764f937bdb466624ca6074cc0cbc84f33d59b4453b55be5691f4fbd4
-DIST charliecloud-0.31.tar.gz 534662 BLAKE2B 08f95f4e37e4de3590344f14cf1ce6e502af414806cc625b8b4be454c1e1e9611d40e599828033a08dfba8ff6fa6fbcee107f19c38ce247addace6a91876dea8 SHA512 9fdcabbf533ab42556bcd8552c42dce3096dffd1f863e2a7a2e87a4596e1df601d55e56fde48cfd88fac62b31bad4257d1b1cdbb9a82df3e32ad4b5f1842307e
DIST charliecloud-0.32.tar.gz 549184 BLAKE2B 5d574ccf2fb36b0acf4f436099ba8344b5d9058d5f79abb8d56082d86b2f9e7207052009b2d49ed50eaede7411796804944fbe11c0d7bcf21f2d62ba01b2c28f SHA512 c32362a219fbe7ec298ac314f58a17e0e6972a3436f66a0243a77c8c05007e6fea3ac8d4ddc15274737eacf3ba32601c0198fc5a39bccb4017d675a149366aee
DIST charliecloud-0.33.tar.gz 559786 BLAKE2B 46e8a488af5a27e6b52ae41118cea663cd6c01f8a24566576dbdc7bac99bd94ac50c0559da07a204c2e68ed46edb8c5a5e0bd26986b5bc960901457af632e134 SHA512 d6854873bdfca5512c54ba28ff70721442241a00cbec6d67c9693e946c6925d030773382c8ba9fc3ebcdfd52da56580e6c4e3ad7080d51d9844ad6f216f15e70
diff --git a/sys-cluster/charliecloud/charliecloud-0.30.ebuild b/sys-cluster/charliecloud/charliecloud-0.30.ebuild
deleted file mode 100644
index f57bb46d685e..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.30.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools optfeature python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
- S="${WORKDIR}/${P}"
-else
- SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="ch-image doc"
-
-# Extensive test suite exists, but downloads container images
-# directly and via Docker and installs packages inside using apt/yum.
-# Additionally, clashes with portage namespacing and sandbox.
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- elibc_musl? ( sys-libs/argp-standalone )
-"
-DEPEND="
- ch-image? (
- $(python_gen_cond_dep '
- dev-python/lark[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- )
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
- ')
- net-misc/rsync
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-dash.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local econf_args=()
- econf_args+=(
- $(use_enable doc html)
- $(use_enable ch-image)
- # Libdir is used as a libexec-style destination.
- --libdir="${EPREFIX}"/usr/lib
- # Attempts to call python-exec directly otherwise.
- --with-sphinx-python="${EPYTHON}"
- # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808
- --enable-buggy-build
- # Do not use bundled version of dev-python/lark.
- --disable-bundled-lark
- # Use correct shebang.
- --with-python="${PYTHON}"
- )
- econf "${econf_args[@]}"
-}
-
-pkg_postinst() {
- elog "Various builders are supported, as alternative to the internal ch-image."
- 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
- optfeature "Build versioning with ch-image" dev-vcs/git
-}
diff --git a/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild b/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
deleted file mode 100644
index 3478b9b51f7d..000000000000
--- a/sys-cluster/charliecloud/charliecloud-0.31-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit autotools optfeature python-single-r1
-
-if [[ ${PV} == "9999" ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/hpc/${PN}.git"
- S="${WORKDIR}/${P}"
-else
- SRC_URI="https://github.com/hpc/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86 ~x86-linux"
-fi
-
-DESCRIPTION="Lightweight user-defined software stacks for high-performance computing"
-HOMEPAGE="https://hpc.github.io/charliecloud/"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-IUSE="ch-image doc"
-
-# Extensive test suite exists, but downloads container images
-# directly and via Docker and installs packages inside using apt/yum.
-# Additionally, clashes with portage namespacing and sandbox.
-RESTRICT="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
- elibc_musl? ( sys-libs/argp-standalone )
-"
-DEPEND="
- ch-image? (
- $(python_gen_cond_dep '
- dev-python/lark[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]
- ')
- )
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/sphinx-rtd-theme[${PYTHON_USEDEP}]
- ')
- net-misc/rsync
- )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-realpath_return.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local econf_args=()
- econf_args+=(
- $(use_enable doc html)
- $(use_enable ch-image)
- # Libdir is used as a libexec-style destination.
- --libdir="${EPREFIX}"/usr/lib
- # Attempts to call python-exec directly otherwise.
- --with-sphinx-python="${EPYTHON}"
- # This disables -Werror, see also: https://github.com/hpc/charliecloud/pull/808
- --enable-buggy-build
- # Do not use bundled version of dev-python/lark.
- --disable-bundled-lark
- # Use correct shebang.
- --with-python="${PYTHON}"
- )
- econf "${econf_args[@]}"
-}
-
-src_install() {
- docompress -x "${EPREFIX}"/usr/share/doc/"${PF}"/examples
- default
-}
-
-pkg_postinst() {
- elog "Various builders are supported, as alternative to the internal ch-image."
- 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
- optfeature "Build versioning with ch-image" dev-vcs/git
-}
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch b/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch
deleted file mode 100644
index ba76e3fee59f..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.30-dash.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
-
diff --git a/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch b/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
deleted file mode 100644
index 7b320fa9dbab..000000000000
--- a/sys-cluster/charliecloud/files/charliecloud-0.31-realpath_return.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e6d25474fcd326ae657c08d7b49606aeabc98b51 Mon Sep 17 00:00:00 2001
-From: Oliver Freyermuth <o.freyermuth@googlemail.com>
-Date: Sat, 28 Jan 2023 21:25:09 +0100
-Subject: [PATCH] ch-misc: Do not check errno in realpath_ unless realpath
- returns NULL
-Bug: https://github.com/hpc/charliecloud/pull/1550
-
-glibc's realpath may set errno also on success, as POSIX specifies
-errno should only be checked after realpath if the return value is not NULL.
-
-See for example:
- https://bugzilla.redhat.com/show_bug.cgi?id=1916968
----
- bin/ch_misc.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/ch_misc.c b/bin/ch_misc.c
-index 04ac52a..93a3339 100644
---- a/bin/ch_misc.c
-+++ b/bin/ch_misc.c
-@@ -589,7 +589,7 @@ char *realpath_(const char *path, bool fail_ok)
- errno = 0;
- pathc = realpath(path, NULL);
-
-- if (errno != 0) {
-+ if (pathc == NULL && errno != 0) {
- if (fail_ok) {
- T_ (pathc = strdup(path));
- } else {
---
-2.39.1
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-06-13 20:50 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-07 18:31 [gentoo-commits] repo/gentoo:master commit in: sys-cluster/charliecloud/files/, sys-cluster/charliecloud/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2019-07-18 8:00 Michał Górny
2020-06-14 14:05 Joonas Niilola
2021-12-21 1:56 Sam James
2023-01-19 13:42 Nicolas Bock
2023-06-13 20:50 Nicolas Bock
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox