1 |
commit: e48d15c0567348bce2ea174432a066ddfc4f3de5 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 9 18:48:16 2017 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 9 18:48:31 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48d15c0 |
7 |
|
8 |
sys-cluster/singularity: Version Bump |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/5005 |
11 |
|
12 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=621248 |
13 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
14 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
15 |
|
16 |
sys-cluster/singularity/Manifest | 1 + |
17 |
.../files/singularity-2.3.1-slurm.patch | 54 ++++++++++++++++++++++ |
18 |
sys-cluster/singularity/metadata.xml | 5 ++ |
19 |
sys-cluster/singularity/singularity-2.3.1.ebuild | 48 +++++++++++++++++++ |
20 |
4 files changed, 108 insertions(+) |
21 |
|
22 |
diff --git a/sys-cluster/singularity/Manifest b/sys-cluster/singularity/Manifest |
23 |
index 8ac63cfcb31..a5f4dc4fadc 100644 |
24 |
--- a/sys-cluster/singularity/Manifest |
25 |
+++ b/sys-cluster/singularity/Manifest |
26 |
@@ -1 +1,2 @@ |
27 |
DIST singularity-2.2.1.tar.gz 493368 SHA256 0e2a0b0cf6c8d4dc041365f715b2df157e0d8d89986e4eb111c61716df031c8a SHA512 b1195e98254957cd8d80b35b13d4f11060c5836f05ed450d242544fc30f8c298b837ba8986b1184288bc9a5ff2ebb5b1f56dc55a0686b540242b0042a152f902 WHIRLPOOL 3d3c5cb0928bd5beb683c4075c88453d076795c0e41ad30676f7169ccbd6d71a70ad64104833925913138f47b8fc318e90366af79259a05bad41bb0a42703b05 |
28 |
+DIST singularity-2.3.1.tar.gz 643021 SHA256 dcccae9ff67a550d142c94e932c0fb59442dd59ae69ce1deeb7ba45829ef2cd7 SHA512 36c581e8dba57d133013c2fcfea26886b54a1a9a9165b011d2cebacb2a6249fe0f8e5aa91ed90f7a18855c658300682436c431a226629408f31422cc8a036600 WHIRLPOOL d9bb8604ce2afb6bb2b5b257eb88276a93987916cd4c08ecc800d98761f5d1ae54e48ed615d77b1c992bcc8bb6202e9bf5e04637d10d1126fba6d1c2619cb98c |
29 |
|
30 |
diff --git a/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch b/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch |
31 |
new file mode 100644 |
32 |
index 00000000000..71a8d9972b7 |
33 |
--- /dev/null |
34 |
+++ b/sys-cluster/singularity/files/singularity-2.3.1-slurm.patch |
35 |
@@ -0,0 +1,54 @@ |
36 |
+From e858cfaf73eadb4cf4076a754c4836816c908d44 Mon Sep 17 00:00:00 2001 |
37 |
+From: Petr Votava <votava.petr@××××.com> |
38 |
+Date: Thu, 29 Jun 2017 16:53:48 +0000 |
39 |
+Subject: [PATCH] A patch for slurm plugin build |
40 |
+ |
41 |
+--- |
42 |
+ src/slurm/Makefile.am | 2 +- |
43 |
+ src/slurm/singularity.c | 4 ++-- |
44 |
+ 2 files changed, 3 insertions(+), 3 deletions(-) |
45 |
+ |
46 |
+diff --git a/src/slurm/Makefile.am b/src/slurm/Makefile.am |
47 |
+index 860c7667d..152e41450 100644 |
48 |
+--- a/src/slurm/Makefile.am |
49 |
++++ b/src/slurm/Makefile.am |
50 |
+@@ -4,7 +4,7 @@ plugindir = $(libdir)/slurm |
51 |
+ if WITH_SLURM |
52 |
+ plugin_LTLIBRARIES = singularity_spank.la |
53 |
+ singularity_spank_la_SOURCES = singularity.c |
54 |
+-singularity_spank_la_LIBADD = ../lib/libsingularity_internal.la |
55 |
++singularity_spank_la_LIBADD = ../lib/runtime/libinternal.la |
56 |
+ singularity_spank_la_LDFLAGS = -module -no-undefined -avoid-version -export-symbols-regex '^slurm_spank_|^plugin_' |
57 |
+ endif |
58 |
+ |
59 |
+diff --git a/src/slurm/singularity.c b/src/slurm/singularity.c |
60 |
+index acddddfd1..3509f4d8e 100644 |
61 |
+--- a/src/slurm/singularity.c |
62 |
++++ b/src/slurm/singularity.c |
63 |
+@@ -22,6 +22,7 @@ |
64 |
+ |
65 |
+ #define _GNU_SOURCE 1 |
66 |
+ |
67 |
++#include <stdio.h> |
68 |
+ #include <stdlib.h> |
69 |
+ #include <unistd.h> |
70 |
+ #include <sys/types.h> |
71 |
+@@ -29,9 +30,9 @@ |
72 |
+ #include <string.h> |
73 |
+ |
74 |
+ #include "config.h" |
75 |
+-#include "lib/singularity.h" |
76 |
+ #include "util/util.h" |
77 |
+ #include "util/file.h" |
78 |
++#include "util/registry.h" |
79 |
+ |
80 |
+ #include "slurm/spank.h" |
81 |
+ |
82 |
+@@ -169,7 +170,6 @@ static int setup_container(spank_t spank) |
83 |
+ } |
84 |
+ |
85 |
+ |
86 |
+- char *image; |
87 |
+ if ( ( image = singularity_registry_get("IMAGE") ) == NULL ) { |
88 |
+ singularity_message(ERROR, "SINGULARITY_CONTAINER not defined!\n"); |
89 |
+ } |
90 |
|
91 |
diff --git a/sys-cluster/singularity/metadata.xml b/sys-cluster/singularity/metadata.xml |
92 |
index f4750025819..bb97aa8832e 100644 |
93 |
--- a/sys-cluster/singularity/metadata.xml |
94 |
+++ b/sys-cluster/singularity/metadata.xml |
95 |
@@ -8,4 +8,9 @@ |
96 |
<upstream> |
97 |
<remote-id type="github">singularityware/singularity</remote-id> |
98 |
</upstream> |
99 |
+ <use> |
100 |
+ <flag name="slurm"> |
101 |
+ Compile spank plugin for <pkg>sys-cluster/slurm</pkg> |
102 |
+ </flag> |
103 |
+ </use> |
104 |
</pkgmetadata> |
105 |
|
106 |
diff --git a/sys-cluster/singularity/singularity-2.3.1.ebuild b/sys-cluster/singularity/singularity-2.3.1.ebuild |
107 |
new file mode 100644 |
108 |
index 00000000000..235fb892343 |
109 |
--- /dev/null |
110 |
+++ b/sys-cluster/singularity/singularity-2.3.1.ebuild |
111 |
@@ -0,0 +1,48 @@ |
112 |
+# Copyright 1999-2017 Gentoo Foundation |
113 |
+# Distributed under the terms of the GNU General Public License v2 |
114 |
+ |
115 |
+EAPI=6 |
116 |
+ |
117 |
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} ) |
118 |
+ |
119 |
+inherit autotools eutils python-single-r1 |
120 |
+ |
121 |
+DESCRIPTION="Application containers for Linux" |
122 |
+HOMEPAGE="http://singularity.lbl.gov/" |
123 |
+SRC_URI="https://github.com/${PN}ware/${PN}/releases/download/${PV}/${P}.tar.gz" |
124 |
+ |
125 |
+SLOT="0" |
126 |
+LICENSE="cctbx-2.0" |
127 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
128 |
+IUSE="examples slurm static-libs +suid" |
129 |
+ |
130 |
+RDEPEND=" |
131 |
+ sys-cluster/slurm |
132 |
+" |
133 |
+DEPEND="${RDEPEND}" |
134 |
+ |
135 |
+PATCHES=( |
136 |
+ "${FILESDIR}"/${P}-slurm.patch |
137 |
+) |
138 |
+ |
139 |
+src_prepare() { |
140 |
+ default |
141 |
+ # automake version hardcoding |
142 |
+ eautoreconf |
143 |
+} |
144 |
+ |
145 |
+src_configure() { |
146 |
+ econf \ |
147 |
+ --with-userns \ |
148 |
+ $(use_with slurm) \ |
149 |
+ $(usex suid "" "--disable-suid") \ |
150 |
+ $(use_enable static-libs static) |
151 |
+} |
152 |
+ |
153 |
+src_install() { |
154 |
+ MAKEOPTS+=" -j1" |
155 |
+ default |
156 |
+ prune_libtool_files |
157 |
+ dodoc ChangeLog AUTHORS.md CONTRIBUTING.md |
158 |
+ use examples && dodoc -r examples |
159 |
+} |