diff options
| author |   Michael Mair-Keimberger <mmk@levelnine.at> | 2022-04-26 21:10:42 +0200 |
|---|---|---|
| committer |   Mike Gilbert <floppym@gentoo.org> | 2022-04-26 16:19:38 -0400 |
| commit | 86b8241161fc6c6d8cefe69d1745269d2e4aa1d4 (patch) | |
| tree | 0750a683a2f2a695d74e57b8648cd92845e6eaf6 /dev-util/meson/files | |
| parent | dev-ml/expect_test_helpers_core: add to tree (diff) | |
| download | gentoo-86b8241161fc6c6d8cefe69d1745269d2e4aa1d4.tar.gz gentoo-86b8241161fc6c6d8cefe69d1745269d2e4aa1d4.tar.bz2 gentoo-86b8241161fc6c6d8cefe69d1745269d2e4aa1d4.zip | |
dev-util/meson: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/25216
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'dev-util/meson/files')
| -rw-r--r-- | dev-util/meson/files/meson-0.60.2-check-module-linking.patch | 28 | ||||
| -rw-r--r-- | dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch | 28 |
2 files changed, 0 insertions, 56 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 deleted file mode 100644 index b192a454c28a..000000000000 --- a/dev-util/meson/files/meson-0.60.2-check-module-linking.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/files/meson-mcompile-treat-load-average-as-a-float.patch b/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch deleted file mode 100644 index 9effb382be22..000000000000 --- a/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bb07c850c77e2bd07e1261547bc6b1e6b024f31d Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Fri, 27 Aug 2021 10:17:14 -0400 -Subject: [PATCH] mcompile: treat load-average as a float - -`ninja -l` accepts a double. We should do the same. - -Bug: https://bugs.gentoo.org/810655 ---- - mesonbuild/mcompile.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py -index bb7ecae9b..e20485c76 100644 ---- a/mesonbuild/mcompile.py -+++ b/mesonbuild/mcompile.py -@@ -305,7 +305,7 @@ def add_arguments(parser: 'argparse.ArgumentParser') -> None: - '-l', '--load-average', - action='store', - default=0, -- type=int, -+ type=float, - help='The system load average to try to maintain (if supported).' - ) - parser.add_argument( --- -2.33.0 - |