Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libaio/files/, dev-libs/libaio/
Date: Fri, 18 Sep 2020 10:30:28
Message-Id: 1600425004.ed24d1a828cf19ceb6788c0caf38ce0ffb4fd96b.polynomial-c@gentoo
1 commit: ed24d1a828cf19ceb6788c0caf38ce0ffb4fd96b
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 18 10:13:30 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 18 10:30:04 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed24d1a8
7
8 dev-libs/libaio: Removed old
9
10 Package-Manager: Portage-3.0.7, Repoman-3.0.1
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 dev-libs/libaio/Manifest | 2 -
14 dev-libs/libaio/files/libaio-0.3.109-install.patch | 45 -----------
15 .../libaio/files/libaio-0.3.109-testcase-8.patch | 19 -----
16 dev-libs/libaio/files/libaio-0.3.109-x32.patch | 63 ----------------
17 .../libaio/files/libaio-0.3.110-cppflags.patch | 25 ------
18 .../libaio/files/libaio-0.3.110-link-stdlib.patch | 21 ------
19 .../files/libaio-0.3.110-optional-werror.patch | 30 --------
20 dev-libs/libaio/libaio-0.3.110.ebuild | 83 --------------------
21 dev-libs/libaio/libaio-0.3.111.ebuild | 88 ----------------------
22 9 files changed, 376 deletions(-)
23
24 diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
25 index 9fdec3bf4ca..e956615f88e 100644
26 --- a/dev-libs/libaio/Manifest
27 +++ b/dev-libs/libaio/Manifest
28 @@ -1,3 +1 @@
29 -DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
30 -DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
31 DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa
32
33 diff --git a/dev-libs/libaio/files/libaio-0.3.109-install.patch b/dev-libs/libaio/files/libaio-0.3.109-install.patch
34 deleted file mode 100644
35 index 9c049fcbf5c..00000000000
36 --- a/dev-libs/libaio/files/libaio-0.3.109-install.patch
37 +++ /dev/null
38 @@ -1,45 +0,0 @@
39 -From 2e34caef82a2367a85de4f06daf5e5a92f61e845 Mon Sep 17 00:00:00 2001
40 -From: Mike Frysinger <vapier@g.o>
41 -Date: Sun, 17 Jan 2010 17:10:14 -0500
42 -Subject: [PATCH] fix up install paths
43 -
44 -This is similar to the Fedora patch, but this uses more common conventions
45 -like "DESTDIR" instead of "destdir".
46 -
47 -Signed-off-by: Mike Frysinger <vapier@g.o>
48 ----
49 - src/Makefile | 11 ++++++-----
50 - 1 files changed, 6 insertions(+), 5 deletions(-)
51 -
52 -diff --git a/src/Makefile b/src/Makefile
53 -index 687c7be..ee431a1 100644
54 ---- a/src/Makefile
55 -+++ b/src/Makefile
56 -@@ -1,6 +1,7 @@
57 - prefix=/usr
58 - includedir=$(prefix)/include
59 - libdir=$(prefix)/lib
60 -+usrlibdir=$(libdir)
61 -
62 - CFLAGS ?= -g -fomit-frame-pointer -O2
63 - CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
64 -@@ -53,11 +54,11 @@ $(libname): $(libaio_sobjs) libaio.map
65 - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname,$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
66 -
67 - install: $(all_targets)
68 -- install -D -m 644 libaio.h $(includedir)/libaio.h
69 -- install -D -m 644 libaio.a $(libdir)/libaio.a
70 -- install -D -m 755 $(libname) $(libdir)/$(libname)
71 -- ln -sf $(libname) $(libdir)/$(soname)
72 -- ln -sf $(libname) $(libdir)/libaio.so
73 -+ install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
74 -+ install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
75 -+ install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
76 -+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname)
77 -+ ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so
78 -
79 - $(libaio_objs): libaio.h
80 -
81 ---
82 -1.7.3.1
83 -
84
85 diff --git a/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch b/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch
86 deleted file mode 100644
87 index de66f2110f2..00000000000
88 --- a/dev-libs/libaio/files/libaio-0.3.109-testcase-8.patch
89 +++ /dev/null
90 @@ -1,19 +0,0 @@
91 -Do not ignore return value of ftruncate(): testcases are compiled with -Werror,
92 -and ftruncate is declared with attribute warn_unused_result.
93 ---- harness/cases/8.t.orig 2012-03-09 16:40:04.074168070 +0100
94 -+++ harness/cases/8.t 2012-03-09 16:40:57.777278646 +0100
95 -@@ -9,12 +9,13 @@
96 - {
97 - long long min = 0, max = 9223372036854775807LL;
98 - char c = 0;
99 -+ int ret;
100 -
101 - while (max - min > 1) {
102 - if (pwrite64(fd, &c, 1, (min + max) / 2) == -1)
103 - max = (min + max) / 2;
104 - else {
105 -- ftruncate(fd, 0);
106 -+ ret = ftruncate(fd, 0); assert(ret == 0);
107 - min = (min + max) / 2;
108 - }
109 - }
110
111 diff --git a/dev-libs/libaio/files/libaio-0.3.109-x32.patch b/dev-libs/libaio/files/libaio-0.3.109-x32.patch
112 deleted file mode 100644
113 index 1d2c2a9050f..00000000000
114 --- a/dev-libs/libaio/files/libaio-0.3.109-x32.patch
115 +++ /dev/null
116 @@ -1,63 +0,0 @@
117 -http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=f5c071d93c9e6f57930bce56b1e4f009c160a826
118 -
119 -Upstream-Status: Pending
120 -
121 -Properly load arguments 5 an 6 for x86-64 syscall
122 -Use asm ("r10") and asm ("r8") to load arguments 5 an 6 for x86-64
123 -syscall so that it works with both x32 and x86-64.
124 -
125 -Received this patch from H.J. Lu <hjl.tools@×××××.com>
126 -
127 -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@×××××.com>
128 -2011/12/02
129 -
130 ---- libaio-0.3.109/src/syscall-x86_64.h.x32 2009-10-09 11:17:02.000000000 -0700
131 -+++ libaio-0.3.109/src/syscall-x86_64.h 2011-12-02 09:09:07.537603224 -0800
132 -@@ -1,8 +1,18 @@
133 -+#ifndef __NR_io_setup
134 - #define __NR_io_setup 206
135 -+#endif
136 -+#ifndef __NR_io_destroy
137 - #define __NR_io_destroy 207
138 -+#endif
139 -+#ifndef __NR_io_getevents
140 - #define __NR_io_getevents 208
141 -+#endif
142 -+#ifndef __NR_io_submit
143 - #define __NR_io_submit 209
144 -+#endif
145 -+#ifndef __NR_io_cancel
146 - #define __NR_io_cancel 210
147 -+#endif
148 -
149 - #define __syscall_clobber "r11","rcx","memory"
150 - #define __syscall "syscall"
151 -@@ -42,10 +52,11 @@ return __res; \
152 - type fname (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
153 - { \
154 - long __res; \
155 --__asm__ volatile ("movq %5,%%r10 ;" __syscall \
156 -+register long __a4 asm ("r10") = (long) arg4; \
157 -+__asm__ volatile (__syscall \
158 - : "=a" (__res) \
159 - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \
160 -- "d" ((long)(arg3)),"g" ((long)(arg4)) : __syscall_clobber,"r10" ); \
161 -+ "d" ((long)(arg3)),"r" (__a4)); \
162 - return __res; \
163 - }
164 -
165 -@@ -54,10 +65,11 @@ return __res; \
166 - type fname (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5) \
167 - { \
168 - long __res; \
169 --__asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " __syscall \
170 -+register long __a4 asm ("r10") = (long) arg4; \
171 -+register long __a5 asm ("r8") = (long) arg5; \
172 -+__asm__ volatile ( __syscall \
173 - : "=a" (__res) \
174 - : "0" (__NR_##sname),"D" ((long)(arg1)),"S" ((long)(arg2)), \
175 -- "d" ((long)(arg3)),"g" ((long)(arg4)),"g" ((long)(arg5)) : \
176 -- __syscall_clobber,"r8","r10" ); \
177 -+ "d" ((long)(arg3)),"r" (__a4),"r" (__a5)); \
178 - return __res; \
179 - }
180
181 diff --git a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch
182 deleted file mode 100644
183 index 4567ac94668..00000000000
184 --- a/dev-libs/libaio/files/libaio-0.3.110-cppflags.patch
185 +++ /dev/null
186 @@ -1,25 +0,0 @@
187 -From 3bf96bb62370035dba18d4b25459406b32365cfc Mon Sep 17 00:00:00 2001
188 -From: Mike Frysinger <vapier@g.o>
189 -Date: Wed, 26 Mar 2014 23:10:18 -0400
190 -Subject: [PATCH] respect env CPPFLAGS
191 -
192 -Signed-off-by: Mike Frysinger <vapier@g.o>
193 ----
194 - src/Makefile | 1 +
195 - 1 file changed, 1 insertion(+)
196 -
197 -diff --git a/src/Makefile b/src/Makefile
198 -index 49f448f..b918c8b 100644
199 ---- a/src/Makefile
200 -+++ b/src/Makefile
201 -@@ -5,6 +5,7 @@ usrlibdir=$(libdir)
202 -
203 - CFLAGS ?= -g -fomit-frame-pointer -O2
204 - CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
205 -+CFLAGS += $(CPPFLAGS)
206 - SO_CFLAGS=-shared $(CFLAGS)
207 - L_CFLAGS=$(CFLAGS)
208 - LINK_FLAGS=
209 ---
210 -1.9.1
211 -
212
213 diff --git a/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch b/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch
214 deleted file mode 100644
215 index 696a928f24d..00000000000
216 --- a/dev-libs/libaio/files/libaio-0.3.110-link-stdlib.patch
217 +++ /dev/null
218 @@ -1,21 +0,0 @@
219 -From: Gokturk Yuksek <gokturk@××××××××××.edu>
220 -Subject: [PATCH] Link against stdlib to resolve fortified functions
221 -
222 -When '-fstack-protector-strong' is included in CFLAGS, the function
223 -'__stack_chk_fail_local' needs to be pulled from libc. However, upstream
224 -uses '-nostdlib' to avoid linking against any C library or gcc libs. Remove
225 -'-nostdlib' and '-nostartfiles' to pull the required symbols from libc.
226 -
227 -Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558406
228 -
229 ---- a/src/Makefile
230 -+++ b/src/Makefile
231 -@@ -4,7 +4,7 @@
232 - usrlibdir=$(libdir)
233 -
234 - CFLAGS ?= -g -fomit-frame-pointer -O2
235 --CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC
236 -+CFLAGS += -Wall -I. -fPIC
237 - CFLAGS += $(CPPFLAGS)
238 - SO_CFLAGS=-shared $(CFLAGS)
239 - L_CFLAGS=$(CFLAGS)
240
241 diff --git a/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch
242 deleted file mode 100644
243 index 2933cf5244b..00000000000
244 --- a/dev-libs/libaio/files/libaio-0.3.110-optional-werror.patch
245 +++ /dev/null
246 @@ -1,30 +0,0 @@
247 -From 0cc7dc108d0b2288b40d82bb2fd1fd8bdc08f764 Mon Sep 17 00:00:00 2001
248 -From: Mike Frysinger <vapier@g.o>
249 -Date: Wed, 26 Mar 2014 23:07:58 -0400
250 -Subject: [PATCH] make -Werror into an optional flag
251 -
252 -This lets distros disable the flag as random errors might come up with
253 -different compiler flags and older/newer toolchain versions.
254 -
255 -Signed-off-by: Mike Frysinger <vapier@g.o>
256 ----
257 - harness/Makefile | 3 ++-
258 - 1 file changed, 2 insertions(+), 1 deletion(-)
259 -
260 -diff --git a/harness/Makefile b/harness/Makefile
261 -index 2a88e71..cf8c90d 100644
262 ---- a/harness/Makefile
263 -+++ b/harness/Makefile
264 -@@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
265 - HARNESS_SRCS:=main.c
266 - # io_queue.c
267 -
268 --CFLAGS+=-Wall -Werror -I../src -g -O
269 -+CFLAGS_WERROR?=-Werror
270 -+CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O
271 - #-lpthread -lrt
272 -
273 - all: $(PROGS)
274 ---
275 -1.9.1
276 -
277
278 diff --git a/dev-libs/libaio/libaio-0.3.110.ebuild b/dev-libs/libaio/libaio-0.3.110.ebuild
279 deleted file mode 100644
280 index 0fc7844e269..00000000000
281 --- a/dev-libs/libaio/libaio-0.3.110.ebuild
282 +++ /dev/null
283 @@ -1,83 +0,0 @@
284 -# Copyright 1999-2020 Gentoo Authors
285 -# Distributed under the terms of the GNU General Public License v2
286 -
287 -EAPI=5
288 -
289 -inherit eutils multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
290 -
291 -DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
292 -HOMEPAGE="http://lse.sourceforge.net/io/aio.html"
293 -SRC_URI="mirror://debian/pool/main/liba/${PN}/${PN}_${PV}.orig.tar.gz -> ${P}.tar.gz"
294 -
295 -LICENSE="LGPL-2"
296 -SLOT="0"
297 -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
298 -IUSE="static-libs test"
299 -RESTRICT="!test? ( test )"
300 -
301 -src_prepare() {
302 - epatch \
303 - "${FILESDIR}"/${PN}-0.3.109-install.patch \
304 - "${FILESDIR}"/${PN}-0.3.109-x32.patch \
305 - "${FILESDIR}"/${PN}-0.3.109-testcase-8.patch \
306 - "${FILESDIR}"/${PN}-0.3.110-cppflags.patch \
307 - "${FILESDIR}"/${PN}-0.3.110-optional-werror.patch \
308 - "${FILESDIR}"/${PN}-0.3.110-link-stdlib.patch #558406
309 -
310 - local sed_args=(
311 - -e "/^prefix=/s:/usr:${EPREFIX}/usr:"
312 - -e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
313 - )
314 - if ! use static-libs; then
315 - sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
316 - # Tests require the static library to be built.
317 - use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
318 - fi
319 - sed -i "${sed_args[@]}" src/Makefile Makefile || die
320 -
321 - multilib_copy_sources
322 -}
323 -
324 -multilib_src_configure() {
325 - if use arm ; then
326 - # When building for thumb, we can't allow frame pointers.
327 - # http://crbug.com/464517
328 - if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
329 - append-flags -fomit-frame-pointer
330 - fi
331 - fi
332 -}
333 -
334 -_emake() {
335 - CC=$(tc-getCC) \
336 - AR=$(tc-getAR) \
337 - RANLIB=$(tc-getRANLIB) \
338 - ABI_LIBDIR=$(get_libdir) \
339 - CFLAGS_WERROR= \
340 - emake "$@"
341 -}
342 -
343 -multilib_src_compile() {
344 - _emake
345 -}
346 -
347 -multilib_src_test() {
348 - mkdir -p testdir || die
349 - # 'make check' breaks with sandbox, 'make partcheck' works
350 - _emake partcheck prefix="${S}/src" libdir="${S}/src"
351 -}
352 -
353 -multilib_src_install() {
354 - _emake install DESTDIR="${D}"
355 -}
356 -
357 -multilib_src_install_all() {
358 - doman man/*
359 - dodoc ChangeLog TODO
360 -
361 - # move crap to / for multipath-tools #325355
362 - gen_usr_ldscript -a aio
363 -
364 - # This lib is a bare minimal shim on top of kernel syscalls.
365 - export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
366 -}
367
368 diff --git a/dev-libs/libaio/libaio-0.3.111.ebuild b/dev-libs/libaio/libaio-0.3.111.ebuild
369 deleted file mode 100644
370 index 904ebacb9c9..00000000000
371 --- a/dev-libs/libaio/libaio-0.3.111.ebuild
372 +++ /dev/null
373 @@ -1,88 +0,0 @@
374 -# Copyright 1999-2020 Gentoo Authors
375 -# Distributed under the terms of the GNU General Public License v2
376 -
377 -EAPI=7
378 -
379 -inherit multilib-minimal toolchain-funcs flag-o-matic usr-ldscript
380 -
381 -DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
382 -HOMEPAGE="https://pagure.io/libaio"
383 -if [[ "${PV}" == 9999 ]] ; then
384 - inherit git-r3
385 - EGIT_REPO_URI="https://pagure.io/libaio.git"
386 -else
387 - SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
388 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
389 -fi
390 -LICENSE="LGPL-2"
391 -SLOT="0"
392 -IUSE="static-libs test"
393 -RESTRICT="!test? ( test )"
394 -
395 -PATCHES=(
396 - "${FILESDIR}"/${PN}-0.3.109-install.patch
397 - "${FILESDIR}"/${PN}-0.3.110-cppflags.patch
398 - "${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
399 - "${FILESDIR}"/${PN}-0.3.110-link-stdlib.patch #558406
400 -)
401 -
402 -src_prepare() {
403 - default
404 -
405 - local sed_args=(
406 - -e "/^prefix=/s:/usr:${EPREFIX}/usr:"
407 - -e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
408 - )
409 - if ! use static-libs; then
410 - sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
411 - # Tests require the static library to be built.
412 - use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
413 - fi
414 - sed -i "${sed_args[@]}" src/Makefile Makefile || die
415 -
416 - multilib_copy_sources
417 -}
418 -
419 -multilib_src_configure() {
420 - if use arm ; then
421 - # When building for thumb, we can't allow frame pointers.
422 - # http://crbug.com/464517
423 - if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
424 - append-flags -fomit-frame-pointer
425 - fi
426 - fi
427 -}
428 -
429 -_emake() {
430 - CC=$(tc-getCC) \
431 - AR=$(tc-getAR) \
432 - RANLIB=$(tc-getRANLIB) \
433 - ABI_LIBDIR=$(get_libdir) \
434 - CFLAGS_WERROR= \
435 - emake "$@"
436 -}
437 -
438 -multilib_src_compile() {
439 - _emake
440 -}
441 -
442 -multilib_src_test() {
443 - mkdir -p testdir || die
444 - # 'make check' breaks with sandbox, 'make partcheck' works
445 - _emake partcheck prefix="${S}/src" libdir="${S}/src"
446 -}
447 -
448 -multilib_src_install() {
449 - _emake install DESTDIR="${D}"
450 -}
451 -
452 -multilib_src_install_all() {
453 - doman man/*
454 - dodoc ChangeLog TODO
455 -
456 - # move crap to / for multipath-tools #325355
457 - gen_usr_ldscript -a aio
458 -
459 - # This lib is a bare minimal shim on top of kernel syscalls.
460 - export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
461 -}