commit: d4eb421dfbf11992695da541c4dae5535235bd88 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Nov 26 02:28:37 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Nov 26 02:28:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4eb421d
dev-util/meson: fix legacy soname behavior for shared_module targets Closes: https://bugs.gentoo.org/827143 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../files/meson-0.60.2-check-module-linking.patch | 28 ++++++++++++++++++++++ ...{meson-0.60.2.ebuild => meson-0.60.2-r1.ebuild} | 4 ++++ 2 files changed, 32 insertions(+) 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 000000000000..b192a454c28a --- /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 <[email protected]> +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 similarity index 97% rename from dev-util/meson/meson-0.60.2.ebuild rename to dev-util/meson/meson-0.60.2-r1.ebuild index b1532c0364e4..dae5370ccd0e 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
