1 |
commit: f61cf5a67bb91c9aaee1354331ed68578295c212 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 1 20:03:40 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 1 20:05:44 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f61cf5a6 |
7 |
|
8 |
sys-libs/liburing: Removed old |
9 |
|
10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
11 |
|
12 |
sys-libs/liburing/Manifest | 2 - |
13 |
.../files/liburing-0.7-ucontext_h-detection.patch | 72 ---------------------- |
14 |
.../liburing/files/liburing-2.0-spec_version.patch | 29 --------- |
15 |
sys-libs/liburing/liburing-0.7-r1.ebuild | 59 ------------------ |
16 |
sys-libs/liburing/liburing-2.0-r1.ebuild | 59 ------------------ |
17 |
5 files changed, 221 deletions(-) |
18 |
|
19 |
diff --git a/sys-libs/liburing/Manifest b/sys-libs/liburing/Manifest |
20 |
index 274dba180608..397baaaf055a 100644 |
21 |
--- a/sys-libs/liburing/Manifest |
22 |
+++ b/sys-libs/liburing/Manifest |
23 |
@@ -1,3 +1 @@ |
24 |
-DIST liburing-0.7.tar.bz2 86386 BLAKE2B a4fa00cc8e384f9909f3c628d479774beaffd5ab09c9f321ef22bfbabd273e4c8d4dbb30a3280633e89e1a79e893348e68f0aa2f3b1b4deda56759f77d9b1875 SHA512 9a23bc08e0fa59273264295859dddbe3276b2911df6d937b3c6f7647a250a3175222b5f051f3094efc98e48cacd242511327c5c5b895ebde10c8c87929ba4328 |
25 |
-DIST liburing-2.0.tar.bz2 109066 BLAKE2B e2be57f66d2a40650c74502bef55e646986443450b2cdf4d2b5247a3fa099178ae19e61a20e4452dc723351053b613a96743f1268004939da9fddd8f38df3fa5 SHA512 a0da3472eb876c9cfbe56abe14b4d926e4d1c362ee9c4f38eec4c4ab01edab6d76651ffe2afe5cac8589caadc02517950974332eb7990f8bcc9f4f4800b66e33 |
26 |
DIST liburing-2.1.tar.bz2 120806 BLAKE2B 3a09d1504150ed1c111f064187d868fd86ec7c3dbf661f73999f7fbb9c945b528f7ab2e0cfff5d270a1a977f04deedc7c790b6df8708ef2884fbf28c1a9ffd1b SHA512 a658454869b01752b5e499c4f0b50c342a8ff63b3dd1a473a96f9fad03f22a6e4d2354b0e658a4e7e50ea27440a84ee274856b3687803583bc80cb4bc45aec71 |
27 |
|
28 |
diff --git a/sys-libs/liburing/files/liburing-0.7-ucontext_h-detection.patch b/sys-libs/liburing/files/liburing-0.7-ucontext_h-detection.patch |
29 |
deleted file mode 100644 |
30 |
index 24b847d919df..000000000000 |
31 |
--- a/sys-libs/liburing/files/liburing-0.7-ucontext_h-detection.patch |
32 |
+++ /dev/null |
33 |
@@ -1,72 +0,0 @@ |
34 |
-From 1cf969dfcba797a02d74540965677b92d3884cfa Mon Sep 17 00:00:00 2001 |
35 |
-From: Simon Zeni <simon@×××××××××.ca> |
36 |
-Date: Tue, 27 Oct 2020 22:31:21 -0400 |
37 |
-Subject: [PATCH] examples: disable ucontext-cp if ucontext.h is not available |
38 |
- |
39 |
-The header file `ucontext.h` is not available on musl based distros. The |
40 |
-example `ucontext-cp` is not built if `configure` fails to locate the |
41 |
-header. |
42 |
- |
43 |
-Signed-off-by: Simon Zeni <simon@×××××××××.ca> |
44 |
-Signed-off-by: Jens Axboe <axboe@××××××.dk> |
45 |
---- |
46 |
- configure | 21 +++++++++++++++++++++ |
47 |
- examples/Makefile | 6 +++++- |
48 |
- 2 files changed, 26 insertions(+), 1 deletion(-) |
49 |
- |
50 |
-diff --git a/configure b/configure |
51 |
-index c911f59..3b96cde 100755 |
52 |
---- a/configure |
53 |
-+++ b/configure |
54 |
-@@ -287,6 +287,24 @@ if compile_prog_cxx "" "" "C++"; then |
55 |
- fi |
56 |
- print_config "C++" "$has_cxx" |
57 |
- |
58 |
-+########################################## |
59 |
-+# check for ucontext support |
60 |
-+has_ucontext="no" |
61 |
-+cat > $TMPC << EOF |
62 |
-+#include <ucontext.h> |
63 |
-+int main(int argc, char **argv) |
64 |
-+{ |
65 |
-+ ucontext_t ctx; |
66 |
-+ getcontext(&ctx); |
67 |
-+ return 0; |
68 |
-+} |
69 |
-+EOF |
70 |
-+if compile_prog "" "" "has_ucontext"; then |
71 |
-+ has_ucontext="yes" |
72 |
-+fi |
73 |
-+print_config "has_ucontext" "$has_ucontext" |
74 |
-+ |
75 |
-+ |
76 |
- ############################################################################# |
77 |
- |
78 |
- if test "$__kernel_rwf_t" = "yes"; then |
79 |
-@@ -304,6 +322,9 @@ fi |
80 |
- if test "$has_cxx" = "yes"; then |
81 |
- output_sym "CONFIG_HAVE_CXX" |
82 |
- fi |
83 |
-+if test "$has_ucontext" = "yes"; then |
84 |
-+ output_sym "CONFIG_HAVE_UCONTEXT" |
85 |
-+fi |
86 |
- |
87 |
- echo "CC=$cc" >> $config_host_mak |
88 |
- print_config "CC" "$cc" |
89 |
-diff --git a/examples/Makefile b/examples/Makefile |
90 |
-index 0eec627..60c1b71 100644 |
91 |
---- a/examples/Makefile |
92 |
-+++ b/examples/Makefile |
93 |
-@@ -10,7 +10,11 @@ ifneq ($(MAKECMDGOALS),clean) |
94 |
- include ../config-host.mak |
95 |
- endif |
96 |
- |
97 |
--all_targets += io_uring-test io_uring-cp link-cp ucontext-cp |
98 |
-+all_targets += io_uring-test io_uring-cp link-cp |
99 |
-+ |
100 |
-+ifdef CONFIG_HAVE_UCONTEXT |
101 |
-+all_targets += ucontext-cp |
102 |
-+endif |
103 |
- |
104 |
- all: $(all_targets) |
105 |
- |
106 |
|
107 |
diff --git a/sys-libs/liburing/files/liburing-2.0-spec_version.patch b/sys-libs/liburing/files/liburing-2.0-spec_version.patch |
108 |
deleted file mode 100644 |
109 |
index fab05916c366..000000000000 |
110 |
--- a/sys-libs/liburing/files/liburing-2.0-spec_version.patch |
111 |
+++ /dev/null |
112 |
@@ -1,29 +0,0 @@ |
113 |
-From 1815337f7dbb530ae3e3bc1175d8da214cf76eb5 Mon Sep 17 00:00:00 2001 |
114 |
-From: Stefan Hajnoczi <stefanha@××××××.com> |
115 |
-Date: Tue, 9 Mar 2021 14:19:12 +0000 |
116 |
-Subject: [PATCH] spec: bump version to 2.0 |
117 |
- |
118 |
-The shared library is now liburing.so.2 but the pkgconfig and rpm files |
119 |
-still say 0.7. Existing binaries link against liburing.so.1 and will not |
120 |
-automatically pick up the new liburing.so.2 shared library. |
121 |
- |
122 |
-Update the version number in liburing.spec so |
123 |
- |
124 |
-Signed-off-by: Stefan Hajnoczi <stefanha@××××××.com> |
125 |
-Link: https://lore.kernel.org/r/20210309141913.262131-2-stefanha@××××××.com |
126 |
-Signed-off-by: Jens Axboe <axboe@××××××.dk> |
127 |
---- |
128 |
- liburing.spec | 2 +- |
129 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
130 |
- |
131 |
-diff --git a/liburing.spec b/liburing.spec |
132 |
-index fa4d9704..8607074c 100644 |
133 |
---- a/liburing.spec |
134 |
-+++ b/liburing.spec |
135 |
-@@ -1,5 +1,5 @@ |
136 |
- Name: liburing |
137 |
--Version: 0.7 |
138 |
-+Version: 2.0 |
139 |
- Release: 1%{?dist} |
140 |
- Summary: Linux-native io_uring I/O access library |
141 |
- License: (GPLv2 with exceptions and LGPLv2+) or MIT |
142 |
|
143 |
diff --git a/sys-libs/liburing/liburing-0.7-r1.ebuild b/sys-libs/liburing/liburing-0.7-r1.ebuild |
144 |
deleted file mode 100644 |
145 |
index 715212503eba..000000000000 |
146 |
--- a/sys-libs/liburing/liburing-0.7-r1.ebuild |
147 |
+++ /dev/null |
148 |
@@ -1,59 +0,0 @@ |
149 |
-# Copyright 1999-2021 Gentoo Authors |
150 |
-# Distributed under the terms of the GNU General Public License v2 |
151 |
- |
152 |
-EAPI=7 |
153 |
- |
154 |
-inherit multilib-minimal toolchain-funcs |
155 |
- |
156 |
-DESCRIPTION="Efficient I/O with io_uring" |
157 |
-HOMEPAGE="https://github.com/axboe/liburing" |
158 |
-if [[ "${PV}" == *9999 ]] ; then |
159 |
- inherit git-r3 |
160 |
- EGIT_REPO_URI="https://github.com/axboe/liburing.git" |
161 |
-else |
162 |
- SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2" |
163 |
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86" |
164 |
-fi |
165 |
-LICENSE="MIT" |
166 |
-SLOT="0/1.0.7" # liburing.so version |
167 |
- |
168 |
-IUSE="static-libs" |
169 |
-# fsync test hangs forever |
170 |
-RESTRICT="test" |
171 |
- |
172 |
-PATCHES=( |
173 |
- "${FILESDIR}"/${PN}-0.7-ucontext_h-detection.patch |
174 |
-) |
175 |
- |
176 |
-src_prepare() { |
177 |
- default |
178 |
- multilib_copy_sources |
179 |
-} |
180 |
- |
181 |
-multilib_src_configure() { |
182 |
- local myconf=( |
183 |
- --prefix="${EPREFIX}/usr" |
184 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" |
185 |
- --libdevdir="${EPREFIX}/usr/$(get_libdir)" |
186 |
- --mandir="${EPREFIX}/usr/share/man" |
187 |
- --cc="$(tc-getCC)" |
188 |
- ) |
189 |
- # No autotools configure! "econf" will fail. |
190 |
- TMPDIR="${T}" ./configure "${myconf[@]}" |
191 |
-} |
192 |
- |
193 |
-multilib_src_compile() { |
194 |
- emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
195 |
-} |
196 |
- |
197 |
-multilib_src_install_all() { |
198 |
- einstalldocs |
199 |
- |
200 |
- if ! use static-libs ; then |
201 |
- find "${ED}" -type f -name "*.a" -delete || die |
202 |
- fi |
203 |
-} |
204 |
- |
205 |
-multilib_src_test() { |
206 |
- emake V=1 runtests |
207 |
-} |
208 |
|
209 |
diff --git a/sys-libs/liburing/liburing-2.0-r1.ebuild b/sys-libs/liburing/liburing-2.0-r1.ebuild |
210 |
deleted file mode 100644 |
211 |
index 652b4092a8b2..000000000000 |
212 |
--- a/sys-libs/liburing/liburing-2.0-r1.ebuild |
213 |
+++ /dev/null |
214 |
@@ -1,59 +0,0 @@ |
215 |
-# Copyright 1999-2021 Gentoo Authors |
216 |
-# Distributed under the terms of the GNU General Public License v2 |
217 |
- |
218 |
-EAPI=7 |
219 |
- |
220 |
-inherit multilib-minimal toolchain-funcs |
221 |
- |
222 |
-DESCRIPTION="Efficient I/O with io_uring" |
223 |
-HOMEPAGE="https://github.com/axboe/liburing" |
224 |
-if [[ "${PV}" == *9999 ]] ; then |
225 |
- inherit git-r3 |
226 |
- EGIT_REPO_URI="https://github.com/axboe/liburing.git" |
227 |
-else |
228 |
- SRC_URI="https://git.kernel.dk/cgit/${PN}/snapshot/${P}.tar.bz2" |
229 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" |
230 |
-fi |
231 |
-LICENSE="MIT" |
232 |
-SLOT="0/2.0.0" # liburing.so version |
233 |
- |
234 |
-IUSE="static-libs" |
235 |
-# fsync test hangs forever |
236 |
-RESTRICT="test" |
237 |
- |
238 |
-PATCHES=( |
239 |
- "${FILESDIR}/${P}-spec_version.patch" #809095 |
240 |
-) |
241 |
- |
242 |
-src_prepare() { |
243 |
- default |
244 |
- multilib_copy_sources |
245 |
-} |
246 |
- |
247 |
-multilib_src_configure() { |
248 |
- local myconf=( |
249 |
- --prefix="${EPREFIX}/usr" |
250 |
- --libdir="${EPREFIX}/usr/$(get_libdir)" |
251 |
- --libdevdir="${EPREFIX}/usr/$(get_libdir)" |
252 |
- --mandir="${EPREFIX}/usr/share/man" |
253 |
- --cc="$(tc-getCC)" |
254 |
- ) |
255 |
- # No autotools configure! "econf" will fail. |
256 |
- TMPDIR="${T}" ./configure "${myconf[@]}" |
257 |
-} |
258 |
- |
259 |
-multilib_src_compile() { |
260 |
- emake V=1 AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" |
261 |
-} |
262 |
- |
263 |
-multilib_src_install_all() { |
264 |
- einstalldocs |
265 |
- |
266 |
- if ! use static-libs ; then |
267 |
- find "${ED}" -type f -name "*.a" -delete || die |
268 |
- fi |
269 |
-} |
270 |
- |
271 |
-multilib_src_test() { |
272 |
- emake V=1 runtests |
273 |
-} |