| 1 |
commit: d4eb421dfbf11992695da541c4dae5535235bd88 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 26 02:28:37 2021 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 26 02:28:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4eb421d |
| 7 |
|
| 8 |
dev-util/meson: fix legacy soname behavior for shared_module targets |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/827143 |
| 11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/meson-0.60.2-check-module-linking.patch | 28 ++++++++++++++++++++++ |
| 14 |
...{meson-0.60.2.ebuild => meson-0.60.2-r1.ebuild} | 4 ++++ |
| 15 |
2 files changed, 32 insertions(+) |
| 16 |
|
| 17 |
diff --git a/dev-util/meson/files/meson-0.60.2-check-module-linking.patch b/dev-util/meson/files/meson-0.60.2-check-module-linking.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..b192a454c28a |
| 20 |
--- /dev/null |
| 21 |
+++ b/dev-util/meson/files/meson-0.60.2-check-module-linking.patch |
| 22 |
@@ -0,0 +1,28 @@ |
| 23 |
+From df7ddc7ec19886ccdc433f42379c04c1df793565 Mon Sep 17 00:00:00 2001 |
| 24 |
+From: Mike Gilbert <floppym@g.o> |
| 25 |
+Date: Thu, 25 Nov 2021 21:19:32 -0500 |
| 26 |
+Subject: [PATCH] Remove premature return in build.check_module_linking() |
| 27 |
+ |
| 28 |
+We want to loop over all link_targets to update |
| 29 |
+backwards_compat_want_soname if necessary. |
| 30 |
+ |
| 31 |
+Fixes: ec9bdc6edb17d1d9da5df2d6525025242c119f3a |
| 32 |
+--- |
| 33 |
+ mesonbuild/build.py | 1 - |
| 34 |
+ 1 file changed, 1 deletion(-) |
| 35 |
+ |
| 36 |
+diff --git a/mesonbuild/build.py b/mesonbuild/build.py |
| 37 |
+index ad18a7f6a..263942556 100644 |
| 38 |
+--- a/mesonbuild/build.py |
| 39 |
++++ b/mesonbuild/build.py |
| 40 |
+@@ -1601,7 +1601,6 @@ You probably should put it in link_with instead.''') |
| 41 |
+ '\n ' |
| 42 |
+ 'use shared_libary() with `override_options: [\'b_lundef=false\']` instead.') |
| 43 |
+ link_target.backwards_compat_want_soname = True |
| 44 |
+- return |
| 45 |
+ |
| 46 |
+ class Generator(HoldableObject): |
| 47 |
+ def __init__(self, exe: T.Union['Executable', programs.ExternalProgram], |
| 48 |
+-- |
| 49 |
+2.34.0 |
| 50 |
+ |
| 51 |
|
| 52 |
diff --git a/dev-util/meson/meson-0.60.2.ebuild b/dev-util/meson/meson-0.60.2-r1.ebuild |
| 53 |
similarity index 97% |
| 54 |
rename from dev-util/meson/meson-0.60.2.ebuild |
| 55 |
rename to dev-util/meson/meson-0.60.2-r1.ebuild |
| 56 |
index b1532c0364e4..dae5370ccd0e 100644 |
| 57 |
--- a/dev-util/meson/meson-0.60.2.ebuild |
| 58 |
+++ b/dev-util/meson/meson-0.60.2-r1.ebuild |
| 59 |
@@ -33,6 +33,10 @@ DEPEND=" |
| 60 |
) |
| 61 |
" |
| 62 |
|
| 63 |
+PATCHES=( |
| 64 |
+ "${FILESDIR}/meson-0.60.2-check-module-linking.patch" |
| 65 |
+) |
| 66 |
+ |
| 67 |
python_prepare_all() { |
| 68 |
local disable_unittests=( |
| 69 |
# ASAN and sandbox both want control over LD_PRELOAD |
Archives