public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libaio/, dev-libs/libaio/files/
@ 2019-04-24 22:39 Göktürk Yüksek
  0 siblings, 0 replies; 4+ messages in thread
From: Göktürk Yüksek @ 2019-04-24 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     06925b0633e16fcd92fbfdaf390a00bdecbaec0d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 10:58:13 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 22:30:16 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06925b06

dev-libs/libaio: Bump to version 0.3.111

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 dev-libs/libaio/Manifest                           |  1 +
 .../files/libaio-0.3.111-optional-werror.patch     | 30 ++++++++
 dev-libs/libaio/libaio-0.3.111.ebuild              | 87 ++++++++++++++++++++++
 3 files changed, 118 insertions(+)

diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 4bb3d630173..56396318f01 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1 +1,2 @@
 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
+DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e

diff --git a/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch
new file mode 100644
index 00000000000..5b6f91e56d9
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.111-optional-werror.patch
@@ -0,0 +1,30 @@
+From ebe62b178f3e5fcde8a311e64aaffe62099204a5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 21 Apr 2019 12:44:26 +0200
+Subject: [PATCH] make -Werror into an optional flag
+
+This lets distros disable the flag as random errors might come up with
+different compiler flags and older/newer toolchain versions.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ harness/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/harness/Makefile b/harness/Makefile
+index f477737..a155c4b 100644
+--- a/harness/Makefile
++++ b/harness/Makefile
+@@ -6,7 +6,8 @@ PROGS:=$(PARTPROGS) $(EXTRAPROGS)
+ HARNESS_SRCS:=main.c
+ # io_queue.c
+ 
+-CFLAGS+=-Wall -Werror -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
++CFLAGS_WERROR?=-Werror
++CFLAGS+=-Wall $(CFLAGS_WERROR) -I../src -g -O2 -DPAGE_SIZE=$(shell getconf PAGESIZE)
+ #-lpthread -lrt
+ 
+ all: $(PROGS)
+-- 
+2.21.0
+

diff --git a/dev-libs/libaio/libaio-0.3.111.ebuild b/dev-libs/libaio/libaio-0.3.111.ebuild
new file mode 100644
index 00000000000..1f25348ff60
--- /dev/null
+++ b/dev-libs/libaio/libaio-0.3.111.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs flag-o-matic
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="https://pagure.io/libaio"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://pagure.io/libaio.git"
+else
+	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.109-install.patch
+	"${FILESDIR}"/${PN}-0.3.110-cppflags.patch
+	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+	"${FILESDIR}"/${PN}-0.3.110-link-stdlib.patch #558406
+)
+
+src_prepare() {
+	default
+
+	local sed_args=(
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
+		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+	)
+	if ! use static-libs; then
+		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
+		# Tests require the static library to be built.
+		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
+	fi
+	sed -i "${sed_args[@]}" src/Makefile Makefile || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if use arm ; then
+		# When building for thumb, we can't allow frame pointers.
+		# http://crbug.com/464517
+		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
+			append-flags -fomit-frame-pointer
+		fi
+	fi
+}
+
+_emake() {
+	CC=$(tc-getCC) \
+	AR=$(tc-getAR) \
+	RANLIB=$(tc-getRANLIB) \
+	ABI_LIBDIR=$(get_libdir) \
+	CFLAGS_WERROR= \
+	emake "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_test() {
+	mkdir -p testdir || die
+	# 'make check' breaks with sandbox, 'make partcheck' works
+	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+	doman man/*
+	dodoc ChangeLog TODO
+
+	# move crap to / for multipath-tools #325355
+	gen_usr_ldscript -a aio
+
+	# This lib is a bare minimal shim on top of kernel syscalls.
+	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libaio/, dev-libs/libaio/files/
@ 2019-04-24 22:39 Göktürk Yüksek
  0 siblings, 0 replies; 4+ messages in thread
From: Göktürk Yüksek @ 2019-04-24 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c241f65a3c32bd643e5dfb35d40db993eb062640
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 11:26:30 2019 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 22:30:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c241f65a

dev-libs/libaio: Added live ebuild

Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
Signed-off-by: Göktürk Yüksek <gokturk <AT> gentoo.org>

 .../libaio/files/libaio-0.3.112-cppflags.patch     | 25 +++++++
 dev-libs/libaio/files/libaio-0.3.112-install.patch | 60 +++++++++++++++
 dev-libs/libaio/libaio-9999.ebuild                 | 87 ++++++++++++++++++++++
 3 files changed, 172 insertions(+)

diff --git a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
new file mode 100644
index 00000000000..2f1ba4b7aec
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
@@ -0,0 +1,25 @@
+From 1df69d571c5b764c42ba17970707cc29d2394a25 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 21 Apr 2019 13:04:24 +0200
+Subject: [PATCH 2/2] respect env CPPFLAGS
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ src/Makefile | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Makefile b/src/Makefile
+index 66534b9..44bbef8 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -5,6 +5,7 @@ usrlibdir=$(libdir)
+ 
+ CFLAGS ?= -g -fomit-frame-pointer -O2
+ CFLAGS += -Wall -I. -fPIC
++CFLAGS += $(CPPFLAGS)
+ SO_CFLAGS=-shared $(CFLAGS)
+ L_CFLAGS=$(CFLAGS)
+ LINK_FLAGS=
+-- 
+2.21.0
+

diff --git a/dev-libs/libaio/files/libaio-0.3.112-install.patch b/dev-libs/libaio/files/libaio-0.3.112-install.patch
new file mode 100644
index 00000000000..d1b1873b501
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.112-install.patch
@@ -0,0 +1,60 @@
+From f8fbbc9733035c96ffb085726bf24d15502e1095 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Sun, 21 Apr 2019 13:02:16 +0200
+Subject: [PATCH 1/2] fix up install paths
+
+This is similar to the Fedora patch, but this uses more common conventions
+like "DESTDIR" instead of "destdir".
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ Makefile     |  2 +-
+ src/Makefile | 11 ++++++-----
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c1fb831..e9dbdb0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,7 +14,7 @@ all:
+ 	@$(MAKE) -C src
+ 
+ install:
+-	@$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir)
++	@$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir)
+ 
+ check:
+ 	@$(MAKE) -C harness check
+diff --git a/src/Makefile b/src/Makefile
+index 37ae219..66534b9 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,6 +1,7 @@
+ prefix=/usr
+ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
++usrlibdir=$(libdir)
+ 
+ CFLAGS ?= -g -fomit-frame-pointer -O2
+ CFLAGS += -Wall -I. -fPIC
+@@ -58,12 +59,12 @@ $(libname): $(libaio_sobjs) libaio.map
+ 	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
+ 
+ install: $(all_targets)
+-	install -D -m 644 libaio.h $(includedir)/libaio.h
+-	install -D -m 644 libaio.a $(libdir)/libaio.a
++	install -D -m 644 libaio.h $(DESTDIR)$(includedir)/libaio.h
++	install -D -m 644 libaio.a $(DESTDIR)$(usrlibdir)/libaio.a
+ ifeq ($(ENABLE_SHARED),1)
+-	install -D -m 755 $(libname) $(libdir)/$(libname)
+-	ln -sf $(libname) $(libdir)/$(soname)
+-	ln -sf $(libname) $(libdir)/libaio.so
++	install -D -m 755 $(libname) $(DESTDIR)$(libdir)/$(libname)
++	ln -sf $(libname) $(DESTDIR)$(usrlibdir)/$(soname)
++	ln -sf $(libname) $(DESTDIR)$(usrlibdir)/libaio.so
+ endif
+ 
+ $(libaio_objs): libaio.h
+-- 
+2.21.0
+

diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
new file mode 100644
index 00000000000..ddaf4e22813
--- /dev/null
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs flag-o-matic
+
+DESCRIPTION="Asynchronous input/output library that uses the kernels native interface"
+HOMEPAGE="https://pagure.io/libaio"
+if [[ "${PV}" == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://pagure.io/libaio.git"
+else
+	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+IUSE="static-libs test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.112-install.patch
+	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
+	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+)
+
+src_prepare() {
+	default
+
+	local sed_args=(
+		-e "/^prefix=/s:/usr:${EPREFIX}/usr:"
+		-e '/^libdir=/s:lib$:$(ABI_LIBDIR):'
+	)
+	if ! use static-libs; then
+		sed_args+=( -e '/\tinstall .*\/libaio.a/d' )
+		# Tests require the static library to be built.
+		use test || sed_args+=( -e '/^all_targets +=/s/ libaio.a//' )
+	fi
+	sed -i "${sed_args[@]}" src/Makefile Makefile || die
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	if use arm ; then
+		# When building for thumb, we can't allow frame pointers.
+		# http://crbug.com/464517
+		if $(tc-getCPP) ${CFLAGS} ${CPPFLAGS} - <<<$'#ifndef __thumb__\n#error\n#endif' >&/dev/null ; then
+			append-flags -fomit-frame-pointer
+		fi
+	fi
+}
+
+_emake() {
+	CC=$(tc-getCC) \
+	AR=$(tc-getAR) \
+	RANLIB=$(tc-getRANLIB) \
+	ABI_LIBDIR=$(get_libdir) \
+	CFLAGS_WERROR= \
+	emake "$@"
+}
+
+multilib_src_compile() {
+	_emake
+}
+
+multilib_src_test() {
+	mkdir -p testdir || die
+	# 'make check' breaks with sandbox, 'make partcheck' works
+	_emake partcheck prefix="${S}/src" libdir="${S}/src"
+}
+
+multilib_src_install() {
+	_emake install DESTDIR="${D}"
+
+}
+
+multilib_src_install_all() {
+	doman man/*
+	dodoc ChangeLog TODO
+
+	# move crap to / for multipath-tools #325355
+	gen_usr_ldscript -a aio
+
+	# This lib is a bare minimal shim on top of kernel syscalls.
+	export QA_DT_NEEDED=$(find "${ED}" -type f -name 'libaio.so.*' -printf '/%P\n')
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libaio/, dev-libs/libaio/files/
@ 2019-06-04  0:07 Thomas Deutschmann
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Deutschmann @ 2019-06-04  0:07 UTC (permalink / raw
  To: gentoo-commits

commit:     27c251f311e55d74f8db62800612b5f6986bdcbe
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  4 00:02:42 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Jun  4 00:07:31 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c251f3

dev-libs/libaio: bump to v0.3.112

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 dev-libs/libaio/Manifest                           |  1 +
 .../libaio/files/libaio-0.3.112-cppflags.patch     | 25 +++++++---------------
 .../{libaio-9999.ebuild => libaio-0.3.112.ebuild}  |  8 +++----
 dev-libs/libaio/libaio-9999.ebuild                 |  8 +++----
 4 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/dev-libs/libaio/Manifest b/dev-libs/libaio/Manifest
index 56396318f01..9fdec3bf4ca 100644
--- a/dev-libs/libaio/Manifest
+++ b/dev-libs/libaio/Manifest
@@ -1,2 +1,3 @@
 DIST libaio-0.3.110.tar.gz 42270 BLAKE2B e774e5888106ffcf4db08569a8b3dc6722f4e0e8278e9f2fafe865e282c0568059e8dbb37aab7a33719ab4d80f42404bfb1d4ab03f5c066d9eb75301676f525e SHA512 664295d330d6e9adc005e2331e77582619625b479ffc2b81728ba6a682487380ee936079c4a69d35144b458bbe35c612f4ed9b32e913bd7e109b824345763eb3
 DIST libaio-0.3.111.tar.gz 44557 BLAKE2B dc2f44599218de0ca80cfc17f604eb85c9b1241ce7221f49f1a4ee8c5bd3fa135c29ac8d97f6f97550a508e27b0dc92eb709256ffd803c1feca255016a4d674d SHA512 259b89647e22ba47edd4076b8d6aa8ab89af197b64930aa5b01b69fc1969b13b4a5e91c449ccdc9b2746c9eae3160211ce1fe110d252efeca5f2c56d0ea66e2e
+DIST libaio-0.3.112.tar.gz 46977 BLAKE2B 088f3b195a65bdc97ae2318e47af17c65259ed3208dca7bfef93c81a800602085e5b2078dbd436c740be316d0ebd923a1b3b7c0808257e2e7c7fb0f7ae1e0dba SHA512 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa

diff --git a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
index 2f1ba4b7aec..dddb9c21660 100644
--- a/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
+++ b/dev-libs/libaio/files/libaio-0.3.112-cppflags.patch
@@ -1,25 +1,16 @@
-From 1df69d571c5b764c42ba17970707cc29d2394a25 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 21 Apr 2019 13:04:24 +0200
-Subject: [PATCH 2/2] respect env CPPFLAGS
+respect env CPPFLAGS
 
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- src/Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/Makefile b/src/Makefile
-index 66534b9..44bbef8 100644
 --- a/src/Makefile
 +++ b/src/Makefile
-@@ -5,6 +5,7 @@ usrlibdir=$(libdir)
+@@ -2,8 +2,9 @@ prefix=/usr
+ includedir=$(prefix)/include
+ libdir=$(prefix)/lib
  
- CFLAGS ?= -g -fomit-frame-pointer -O2
- CFLAGS += -Wall -I. -fPIC
+-CFLAGS ?= -g -fomit-frame-pointer -O2
+-CFLAGS += -Wall -I. -fPIC
++CFLAGS ?= -fomit-frame-pointer -O2
++CFLAGS += -I. -fPIC
 +CFLAGS += $(CPPFLAGS)
  SO_CFLAGS=-shared $(CFLAGS)
  L_CFLAGS=$(CFLAGS)
  LINK_FLAGS=
--- 
-2.21.0
-

diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
similarity index 92%
copy from dev-libs/libaio/libaio-9999.ebuild
copy to dev-libs/libaio/libaio-0.3.112.ebuild
index ddaf4e22813..b6ff5d1d421 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit multilib-minimal toolchain-funcs flag-o-matic
 
@@ -11,15 +11,14 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
-	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.112-install.patch
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
 )
@@ -72,7 +71,6 @@ multilib_src_test() {
 
 multilib_src_install() {
 	_emake install DESTDIR="${D}"
-
 }
 
 multilib_src_install_all() {

diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index ddaf4e22813..b6ff5d1d421 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="7"
 
 inherit multilib-minimal toolchain-funcs flag-o-matic
 
@@ -11,15 +11,14 @@ if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://pagure.io/libaio.git"
 else
-	SRC_URI="https://pagure.io/${PN}/archive/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 LICENSE="LGPL-2"
 SLOT="0"
 IUSE="static-libs test"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.112-install.patch
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
 )
@@ -72,7 +71,6 @@ multilib_src_test() {
 
 multilib_src_install() {
 	_emake install DESTDIR="${D}"
-
 }
 
 multilib_src_install_all() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-libs/libaio/, dev-libs/libaio/files/
@ 2021-10-19  3:21 Sam James
  0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2021-10-19  3:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a9bf59f3fd6ef919eab913ef1d799c093f178081
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 03:19:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 03:21:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9bf59f3

dev-libs/libaio: fix LDFLAGS ordering

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch | 13 +++++++++++++
 dev-libs/libaio/libaio-0.3.112.ebuild                      |  1 +
 dev-libs/libaio/libaio-9999.ebuild                         |  3 ++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
new file mode 100644
index 00000000000..20e23874fb6
--- /dev/null
+++ b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch
@@ -0,0 +1,13 @@
+We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly.
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs)
+ 	$(RANLIB) libaio.a
+ 
+ $(libname): $(libaio_sobjs) libaio.map
+-	$(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS)
++	$(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs)
+ 
+ install: $(all_targets)
+ 	install -D -m 644 libaio.h $(includedir)/libaio.h
+

diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild
index 93a8952b8ee..a83b08bd982 100644
--- a/dev-libs/libaio/libaio-0.3.112.ebuild
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
 )
 
 src_prepare() {

diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild
index 6ddf6077967..232c5368187 100644
--- a/dev-libs/libaio/libaio-9999.ebuild
+++ b/dev-libs/libaio/libaio-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.3.112-cppflags.patch
 	"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch
+	"${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-10-19  3:21 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-24 22:39 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libaio/, dev-libs/libaio/files/ Göktürk Yüksek
  -- strict thread matches above, loose matches on Subject: below --
2019-04-24 22:39 Göktürk Yüksek
2019-06-04  0:07 Thomas Deutschmann
2021-10-19  3:21 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox