1 |
From: Robert Günzler <r@××××××.io> |
2 |
|
3 |
Closes: https://bugs.gentoo.org/709982 |
4 |
Signed-off-by: Robert Günzler <r@××××××.io> |
5 |
--- |
6 |
app-emulation/crun/Manifest | 2 +- |
7 |
.../{crun-0.10.6.ebuild => crun-0.13.ebuild} | 34 ++++++++++--------- |
8 |
...duplicate-json_common-in-makefile-am.patch | 31 +++++++++++++++++ |
9 |
3 files changed, 50 insertions(+), 17 deletions(-) |
10 |
rename app-emulation/crun/{crun-0.10.6.ebuild => crun-0.13.ebuild} (69%) |
11 |
create mode 100644 app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch |
12 |
|
13 |
diff --git a/app-emulation/crun/Manifest b/app-emulation/crun/Manifest |
14 |
index 1652b2325..24ebd99e1 100644 |
15 |
--- a/app-emulation/crun/Manifest |
16 |
+++ b/app-emulation/crun/Manifest |
17 |
@@ -1 +1 @@ |
18 |
-DIST crun-0.10.6.tar.gz 1242736 BLAKE2B 840699c6a07ddaef3f6ab4ce226fa6c4ebf0e32641012b6467a2a622d575a48286555b84140d5a1c947b5ef00a691045b0618533fb246bfb6d605baa262febe4 SHA512 b7db09d0c7d2d6e8b1ea239ead5a2ca2b97f188a74f08f0d5ac787e0a698fddf596e7cfdde482c6bc8790d06a7705613e877344a44691c0be7388e6d046c4b15 |
19 |
+DIST crun-0.13.tar.gz 1305048 BLAKE2B fbffabf4cfc744522147b47c5e2bf2bc48e074866108ec4ec8ab94e7ebdc39451851696fabde268b5853e1c3fafb0ac93527e08fdb766acebdd7cf952a9e1a9e SHA512 314612eaf3097160e9369b3400ac8a83e173ef1a53295191c925e96212ba00d032883db1e4615b8ba42ddb08f1e31ca5e5088ea583a469835ac3c27087a88d6e |
20 |
diff --git a/app-emulation/crun/crun-0.10.6.ebuild b/app-emulation/crun/crun-0.13.ebuild |
21 |
similarity index 69% |
22 |
rename from app-emulation/crun/crun-0.10.6.ebuild |
23 |
rename to app-emulation/crun/crun-0.13.ebuild |
24 |
index a644095e8..7b7d5fcda 100644 |
25 |
--- a/app-emulation/crun/crun-0.10.6.ebuild |
26 |
+++ b/app-emulation/crun/crun-0.13.ebuild |
27 |
@@ -5,20 +5,19 @@ EAPI=7 |
28 |
|
29 |
PYTHON_COMPAT=( python3_{6,7} ) |
30 |
|
31 |
-inherit python-any-r1 |
32 |
+inherit autotools python-any-r1 |
33 |
|
34 |
DESCRIPTION="A fast and low-memory footprint OCI Container Runtime fully written in C" |
35 |
HOMEPAGE="https://github.com/containers/crun" |
36 |
SRC_URI="https://github.com/containers/${PN}/releases/download/${PV}/${P}.tar.gz" |
37 |
|
38 |
-LICENSE="GPL-3 LGPL-3+" |
39 |
+LICENSE="GPL-2+ LGPL-2.1+" |
40 |
SLOT="0" |
41 |
KEYWORDS="~amd64" |
42 |
IUSE="bpf +caps doc seccomp systemd static-libs" |
43 |
|
44 |
DEPEND=" |
45 |
dev-libs/yajl |
46 |
- sys-libs/libseccomp |
47 |
caps? ( sys-libs/libcap ) |
48 |
seccomp? ( sys-libs/libseccomp ) |
49 |
systemd? ( sys-apps/systemd:= ) |
50 |
@@ -30,14 +29,26 @@ BDEPEND=" |
51 |
" |
52 |
|
53 |
# the crun test suite is comprehensive to the extent that tests will fail |
54 |
-# within a sandbox environment, due to the nature of the priveledges |
55 |
-# required to create linux "containers." |
56 |
+# within a sandbox environment, due to the nature of the privileges |
57 |
+# required to create linux "containers". |
58 |
RESTRICT="test" |
59 |
|
60 |
DOCS=README.md |
61 |
|
62 |
+ |
63 |
+PATCHES=( |
64 |
+ # see https://709982.bugs.gentoo.org/attachment.cgi?id=614208 |
65 |
+ "${FILESDIR}/libocispec-deduplicate-json_common-in-makefile-am.patch" |
66 |
+) |
67 |
+ |
68 |
+src_prepare() { |
69 |
+ default |
70 |
+ eautoreconf |
71 |
+} |
72 |
+ |
73 |
src_configure() { |
74 |
econf \ |
75 |
+ --disable-criu \ |
76 |
$(use_enable bpf) \ |
77 |
$(use_enable caps) \ |
78 |
$(use_enable seccomp) \ |
79 |
@@ -46,27 +57,18 @@ src_configure() { |
80 |
} |
81 |
|
82 |
src_compile() { |
83 |
- pushd libocispec || die |
84 |
- emake |
85 |
- popd || die |
86 |
+ emake -C libocispec |
87 |
emake crun |
88 |
if use doc ; then |
89 |
- emake crun.1 |
90 |
+ emake generate-man |
91 |
fi |
92 |
} |
93 |
|
94 |
src_install() { |
95 |
- pushd libocispec || die |
96 |
- emake "DESTDIR=${D}" install-exec |
97 |
- popd || die |
98 |
emake "DESTDIR=${D}" install-exec |
99 |
if use doc ; then |
100 |
emake "DESTDIR=${D}" install-man |
101 |
fi |
102 |
|
103 |
- # there is currently a bug in upstream autotooling that continues to build static libraries despite |
104 |
- # explicit configure options |
105 |
- use static-libs || find "${ED}"/usr -name '*.la' -delete |
106 |
- |
107 |
einstalldocs |
108 |
} |
109 |
diff --git a/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch b/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch |
110 |
new file mode 100644 |
111 |
index 000000000..7d188abf8 |
112 |
--- /dev/null |
113 |
+++ b/app-emulation/crun/files/libocispec-deduplicate-json_common-in-makefile-am.patch |
114 |
@@ -0,0 +1,31 @@ |
115 |
+From 9d58891c058efa55c7b95cb90597d4cadc5c66d8 Mon Sep 17 00:00:00 2001 |
116 |
+From: Bruce Guenter <bruce@××××××××××.org> |
117 |
+Date: Mon, 17 Feb 2020 13:54:14 -0600 |
118 |
+Subject: [PATCH] De-duplicate json_common in Makefile.am |
119 |
+ |
120 |
+The source file src/json_common.c is listed twice in Makefile.am, |
121 |
+leading libtool to produce an archive with duplicated symbols. This |
122 |
+change removes the duplicate source. |
123 |
+ |
124 |
+This was introduced in commit 2e318803a2c49521ea448e3ae010b1564a7e95ed |
125 |
+ |
126 |
+Signed-off-by: Bruce Guenter <bruce@××××××××××.org> |
127 |
+--- |
128 |
+ Makefile.am | 2 +- |
129 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
130 |
+ |
131 |
+diff --git a/Makefile.am b/Makefile.am |
132 |
+index 65bed45..c7ede83 100644 |
133 |
+--- a/libocispec/Makefile.am |
134 |
++++ b/libocispec/Makefile.am |
135 |
+@@ -7,7 +7,7 @@ GITIGNOREFILES = build-aux/ gtk-doc.make config.h.in aclocal.m4 |
136 |
+ noinst_LTLIBRARIES = libocispec.la |
137 |
+ noinst_LIBRARIES = libocispec.a |
138 |
+ |
139 |
+-SOURCE_FILES = src/json_common.c \ |
140 |
++SOURCE_FILES = \ |
141 |
+ src/image_spec_schema_config_schema.c \ |
142 |
+ src/image_spec_schema_content_descriptor.c \ |
143 |
+ src/image_spec_schema_defs.c \ |
144 |
+-- |
145 |
+2.24.1 |
146 |
-- |
147 |
2.26.2 |