From 830f8ad6c9405cb00994efa6eb5e7db1536f9b18 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Thu, 10 Feb 2022 15:40:08 +0000 Subject: [PATCH] dev-util/meson: sync with Gentoo Sync meson and keep only the current stable ebuild (0.60.3). Upstream commit 83cf9e2749be378ca4bb12096c2a33093a0af998 Signed-off-by: Jeremi Piotrowski --- .../portage-stable/dev-util/meson/Manifest | 2 +- .../meson-0.60.2-check-module-linking.patch | 28 +++++++++++++++++++ ...ompile-treat-load-average-as-a-float.patch | 28 +++++++++++++++++++ ...eson-0.57.2.ebuild => meson-0.60.3.ebuild} | 13 +++++++-- .../dev-util/meson/meson-9999.ebuild | 11 ++++++-- .../dev-util/meson/metadata.xml | 2 +- 6 files changed, 77 insertions(+), 7 deletions(-) create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-0.60.2-check-module-linking.patch create mode 100644 sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch rename sdk_container/src/third_party/portage-stable/dev-util/meson/{meson-0.57.2.ebuild => meson-0.60.3.ebuild} (83%) diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest index 765d085eb4..176d826508 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/Manifest @@ -1 +1 @@ -DIST meson-0.57.2.tar.gz 1853721 BLAKE2B 9c167a21745719589a165e7ffc31007bd6307b347027f390fd660b2f44b5a2e6d8f36e999e15fa4b28ae269ddb0bb3897e0297288c59b62cc493aad058126293 SHA512 a3b0bf3d5e1d1b7ac7c97313f43046c94aa2a6b21964958569c89764dfda08db166adb89d48cbfad735bd472114587a71089d5e8b4f0fce04c3289da21b3f40e +DIST meson-0.60.3.tar.gz 2001124 BLAKE2B f66fb29d309f5dea9c0b1934e8b5dfc2b33586e06c6a2d616798d5724216035fe03a3f9b1c6976546d5d5c069734357d61a92aa43de01161cf1fe4297a1d1f2e SHA512 0aa6ef71c20cd899ebb0b202c6319e093e1df1c39fa58c94a1bb479efe630213272127346eab589948898d115d02d64f4bdffd892fbb9700884c1edf2dc6c6dc diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-0.60.2-check-module-linking.patch b/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-0.60.2-check-module-linking.patch new file mode 100644 index 0000000000..b192a454c2 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/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 +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/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch b/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch new file mode 100644 index 0000000000..9effb382be --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/files/meson-mcompile-treat-load-average-as-a-float.patch @@ -0,0 +1,28 @@ +From bb07c850c77e2bd07e1261547bc6b1e6b024f31d Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +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 + diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.57.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.60.3.ebuild similarity index 83% rename from sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.57.2.ebuild rename to sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.60.3.ebuild index 4376ab3bfe..55dd71fc82 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.57.2.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-0.60.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 2016-2021 Gentoo Authors +# Copyright 2016-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{6,7,8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{7,8,9,10} ) if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" @@ -80,6 +80,13 @@ python_test() { # 'test cases/unit/73 summary' expects 80 columns export COLUMNS=80 + # If JAVA_HOME is not set, meson looks for javac in PATH. + # If javac is in /usr/bin, meson assumes /usr/include is a valid + # JDK include path. Setting JAVA_HOME works around this broken + # autodetection. If no JDK is installed, we should end up with an empty + # value in JAVA_HOME, and the tests should get skipped. + export JAVA_HOME=$(java-config -O 2>/dev/null) + ${EPYTHON} -u run_tests.py ) || die "Testing failed with ${EPYTHON}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild index 3b18cdf978..b1532c0364 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/meson-9999.ebuild @@ -1,8 +1,8 @@ # Copyright 2016-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_{7,8,9} ) +EAPI=8 +PYTHON_COMPAT=( python3_{7,8,9,10} ) if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/mesonbuild/meson" @@ -80,6 +80,13 @@ python_test() { # 'test cases/unit/73 summary' expects 80 columns export COLUMNS=80 + # If JAVA_HOME is not set, meson looks for javac in PATH. + # If javac is in /usr/bin, meson assumes /usr/include is a valid + # JDK include path. Setting JAVA_HOME works around this broken + # autodetection. If no JDK is installed, we should end up with an empty + # value in JAVA_HOME, and the tests should get skipped. + export JAVA_HOME=$(java-config -O 2>/dev/null) + ${EPYTHON} -u run_tests.py ) || die "Testing failed with ${EPYTHON}" } diff --git a/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml index aba1d26bb8..caecf6010d 100644 --- a/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-util/meson/metadata.xml @@ -1,5 +1,5 @@ - + floppym@gentoo.org