| 1 |
commit: 86b8241161fc6c6d8cefe69d1745269d2e4aa1d4 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Tue Apr 26 19:10:42 2022 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 26 20:19:38 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86b82411 |
| 7 |
|
| 8 |
dev-util/meson: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/25216 |
| 11 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/meson-0.60.2-check-module-linking.patch | 28 ---------------------- |
| 16 |
...on-mcompile-treat-load-average-as-a-float.patch | 28 ---------------------- |
| 17 |
2 files changed, 56 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
deleted file mode 100644 |
| 21 |
index b192a454c28a..000000000000 |
| 22 |
--- a/dev-util/meson/files/meson-0.60.2-check-module-linking.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,28 +0,0 @@ |
| 25 |
-From df7ddc7ec19886ccdc433f42379c04c1df793565 Mon Sep 17 00:00:00 2001 |
| 26 |
-From: Mike Gilbert <floppym@g.o> |
| 27 |
-Date: Thu, 25 Nov 2021 21:19:32 -0500 |
| 28 |
-Subject: [PATCH] Remove premature return in build.check_module_linking() |
| 29 |
- |
| 30 |
-We want to loop over all link_targets to update |
| 31 |
-backwards_compat_want_soname if necessary. |
| 32 |
- |
| 33 |
-Fixes: ec9bdc6edb17d1d9da5df2d6525025242c119f3a |
| 34 |
---- |
| 35 |
- mesonbuild/build.py | 1 - |
| 36 |
- 1 file changed, 1 deletion(-) |
| 37 |
- |
| 38 |
-diff --git a/mesonbuild/build.py b/mesonbuild/build.py |
| 39 |
-index ad18a7f6a..263942556 100644 |
| 40 |
---- a/mesonbuild/build.py |
| 41 |
-+++ b/mesonbuild/build.py |
| 42 |
-@@ -1601,7 +1601,6 @@ You probably should put it in link_with instead.''') |
| 43 |
- '\n ' |
| 44 |
- 'use shared_libary() with `override_options: [\'b_lundef=false\']` instead.') |
| 45 |
- link_target.backwards_compat_want_soname = True |
| 46 |
-- return |
| 47 |
- |
| 48 |
- class Generator(HoldableObject): |
| 49 |
- def __init__(self, exe: T.Union['Executable', programs.ExternalProgram], |
| 50 |
--- |
| 51 |
-2.34.0 |
| 52 |
- |
| 53 |
|
| 54 |
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 |
| 55 |
deleted file mode 100644 |
| 56 |
index 9effb382be22..000000000000 |
| 57 |
--- a/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch |
| 58 |
+++ /dev/null |
| 59 |
@@ -1,28 +0,0 @@ |
| 60 |
-From bb07c850c77e2bd07e1261547bc6b1e6b024f31d Mon Sep 17 00:00:00 2001 |
| 61 |
-From: Mike Gilbert <floppym@g.o> |
| 62 |
-Date: Fri, 27 Aug 2021 10:17:14 -0400 |
| 63 |
-Subject: [PATCH] mcompile: treat load-average as a float |
| 64 |
- |
| 65 |
-`ninja -l` accepts a double. We should do the same. |
| 66 |
- |
| 67 |
-Bug: https://bugs.gentoo.org/810655 |
| 68 |
---- |
| 69 |
- mesonbuild/mcompile.py | 2 +- |
| 70 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 71 |
- |
| 72 |
-diff --git a/mesonbuild/mcompile.py b/mesonbuild/mcompile.py |
| 73 |
-index bb7ecae9b..e20485c76 100644 |
| 74 |
---- a/mesonbuild/mcompile.py |
| 75 |
-+++ b/mesonbuild/mcompile.py |
| 76 |
-@@ -305,7 +305,7 @@ def add_arguments(parser: 'argparse.ArgumentParser') -> None: |
| 77 |
- '-l', '--load-average', |
| 78 |
- action='store', |
| 79 |
- default=0, |
| 80 |
-- type=int, |
| 81 |
-+ type=float, |
| 82 |
- help='The system load average to try to maintain (if supported).' |
| 83 |
- ) |
| 84 |
- parser.add_argument( |
| 85 |
--- |
| 86 |
-2.33.0 |
| 87 |
- |
Archives