| 1 |
commit: a9bf59f3fd6ef919eab913ef1d799c093f178081 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 19 03:19:23 2021 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 19 03:21:13 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9bf59f3 |
| 7 |
|
| 8 |
dev-libs/libaio: fix LDFLAGS ordering |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch | 13 +++++++++++++ |
| 13 |
dev-libs/libaio/libaio-0.3.112.ebuild | 1 + |
| 14 |
dev-libs/libaio/libaio-9999.ebuild | 3 ++- |
| 15 |
3 files changed, 16 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..20e23874fb6 |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-libs/libaio/files/libaio-0.3.112-respect-LDFLAGS.patch |
| 22 |
@@ -0,0 +1,13 @@ |
| 23 |
+We need to place LDFLAGS earlier to ensure e.g. as-needed works correctly. |
| 24 |
+--- a/src/Makefile |
| 25 |
++++ b/src/Makefile |
| 26 |
+@@ -56,7 +56,7 @@ libaio.a: $(libaio_objs) |
| 27 |
+ $(RANLIB) libaio.a |
| 28 |
+ |
| 29 |
+ $(libname): $(libaio_sobjs) libaio.map |
| 30 |
+- $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) |
| 31 |
++ $(CC) $(SO_CFLAGS) $(LINK_FLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) |
| 32 |
+ |
| 33 |
+ install: $(all_targets) |
| 34 |
+ install -D -m 644 libaio.h $(includedir)/libaio.h |
| 35 |
+ |
| 36 |
|
| 37 |
diff --git a/dev-libs/libaio/libaio-0.3.112.ebuild b/dev-libs/libaio/libaio-0.3.112.ebuild |
| 38 |
index 93a8952b8ee..a83b08bd982 100644 |
| 39 |
--- a/dev-libs/libaio/libaio-0.3.112.ebuild |
| 40 |
+++ b/dev-libs/libaio/libaio-0.3.112.ebuild |
| 41 |
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )" |
| 42 |
PATCHES=( |
| 43 |
"${FILESDIR}"/${PN}-0.3.112-cppflags.patch |
| 44 |
"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch |
| 45 |
+ "${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch |
| 46 |
) |
| 47 |
|
| 48 |
src_prepare() { |
| 49 |
|
| 50 |
diff --git a/dev-libs/libaio/libaio-9999.ebuild b/dev-libs/libaio/libaio-9999.ebuild |
| 51 |
index 6ddf6077967..232c5368187 100644 |
| 52 |
--- a/dev-libs/libaio/libaio-9999.ebuild |
| 53 |
+++ b/dev-libs/libaio/libaio-9999.ebuild |
| 54 |
@@ -1,4 +1,4 @@ |
| 55 |
-# Copyright 1999-2020 Gentoo Authors |
| 56 |
+# Copyright 1999-2021 Gentoo Authors |
| 57 |
# Distributed under the terms of the GNU General Public License v2 |
| 58 |
|
| 59 |
EAPI="7" |
| 60 |
@@ -22,6 +22,7 @@ RESTRICT="!test? ( test )" |
| 61 |
PATCHES=( |
| 62 |
"${FILESDIR}"/${PN}-0.3.112-cppflags.patch |
| 63 |
"${FILESDIR}"/${PN}-0.3.111-optional-werror.patch |
| 64 |
+ "${FILESDIR}"/${PN}-0.3.112-respect-LDFLAGS.patch |
| 65 |
) |
| 66 |
|
| 67 |
src_prepare() { |
Archives