summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-11-25 21:28:37 -0500
committerMike Gilbert <floppym@gentoo.org>2021-11-25 21:28:37 -0500
commitd4eb421dfbf11992695da541c4dae5535235bd88 (patch)
tree88ae49b696afcdf5f28e77fbe689432ea79af8df
parentdev-util/meson: add 0.60.2, drop 0.60.1 (diff)
downloadgentoo-d4eb421dfbf11992695da541c4dae5535235bd88.tar.gz
gentoo-d4eb421dfbf11992695da541c4dae5535235bd88.tar.bz2
gentoo-d4eb421dfbf11992695da541c4dae5535235bd88.zip
dev-util/meson: fix legacy soname behavior for shared_module targets
Closes: https://bugs.gentoo.org/827143 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--dev-util/meson/files/meson-0.60.2-check-module-linking.patch28
-rw-r--r--dev-util/meson/meson-0.60.2-r1.ebuild (renamed from dev-util/meson/meson-0.60.2.ebuild)4
2 files changed, 32 insertions, 0 deletions
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
new file mode 100644
index 00000000000..b192a454c28
--- /dev/null
+++ b/dev-util/meson/files/meson-0.60.2-check-module-linking.patch
@@ -0,0 +1,28 @@
+From df7ddc7ec19886ccdc433f42379c04c1df793565 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Thu, 25 Nov 2021 21:19:32 -0500
+Subject: [PATCH] Remove premature return in build.check_module_linking()
+
+We want to loop over all link_targets to update
+backwards_compat_want_soname if necessary.
+
+Fixes: ec9bdc6edb17d1d9da5df2d6525025242c119f3a
+---
+ mesonbuild/build.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/mesonbuild/build.py b/mesonbuild/build.py
+index ad18a7f6a..263942556 100644
+--- a/mesonbuild/build.py
++++ b/mesonbuild/build.py
+@@ -1601,7 +1601,6 @@ You probably should put it in link_with instead.''')
+ '\n '
+ 'use shared_libary() with `override_options: [\'b_lundef=false\']` instead.')
+ link_target.backwards_compat_want_soname = True
+- return
+
+ class Generator(HoldableObject):
+ def __init__(self, exe: T.Union['Executable', programs.ExternalProgram],
+--
+2.34.0
+
diff --git a/dev-util/meson/meson-0.60.2.ebuild b/dev-util/meson/meson-0.60.2-r1.ebuild
index b1532c0364e..dae5370ccd0 100644
--- a/dev-util/meson/meson-0.60.2.ebuild
+++ b/dev-util/meson/meson-0.60.2-r1.ebuild
@@ -33,6 +33,10 @@ DEPEND="
)
"
+PATCHES=(
+ "${FILESDIR}/meson-0.60.2-check-module-linking.patch"
+)
+
python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD