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() {
