From 03510e036b0c7098205f352965141d340d1caa4f Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Wed, 27 Sep 2023 13:13:09 +0000 Subject: [PATCH] meson, bump version (#9524) --- ...{meson-1.1.0.recipe => meson-1.2.1.recipe} | 20 +++++-- ...on-1.1.0.patchset => meson-1.2.1.patchset} | 53 +++++++++++++++---- 2 files changed, 57 insertions(+), 16 deletions(-) rename dev-util/meson/{meson-1.1.0.recipe => meson-1.2.1.recipe} (74%) rename dev-util/meson/patches/{meson-1.1.0.patchset => meson-1.2.1.patchset} (67%) diff --git a/dev-util/meson/meson-1.1.0.recipe b/dev-util/meson/meson-1.2.1.recipe similarity index 74% rename from dev-util/meson/meson-1.1.0.recipe rename to dev-util/meson/meson-1.2.1.recipe index c359c5789..4fb3de88b 100644 --- a/dev-util/meson/meson-1.1.0.recipe +++ b/dev-util/meson/meson-1.2.1.recipe @@ -6,9 +6,9 @@ COPYRIGHT="2013-2023 The Meson development team" LICENSE="Apache v2" REVISION="1" SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz" -CHECKSUM_SHA256="d9616c44cd6c53689ff8f05fc6958a693f2e17c3472a8daf83cee55dabff829f" +CHECKSUM_SHA256="b1db3a153087549497ee52b1c938d2134e0338214fe14f7efd16fecd57b639f5" PATCHES="meson-$portVersion.patchset" -PYTHON_VERSION="3.9" +PYTHON_VERSION="3.10" ARCHITECTURES="any" @@ -22,14 +22,14 @@ PROVIDES=" " REQUIRES=" haiku - setuptools_python39 + setuptools_python310 cmd:python$PYTHON_VERSION cmd:ninja >= 1.6 " BUILD_REQUIRES=" haiku_devel - setuptools_python39 + setuptools_python310 " BUILD_PREREQUIRES=" cmd:python$PYTHON_VERSION @@ -47,7 +47,7 @@ TEST_REQUIRES=" INSTALL() { # GENERIC: all python_setuptools-based installs need this - python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3.9 + python=$portPackageLinksDir/cmd~python$PYTHON_VERSION/bin/python3.10 pythonVersion=$($python --version 2>&1 | sed 's/Python //' | head -c3) installLocation=$prefix/lib/python$pythonVersion/vendor-packages/ export PYTHONPATH=$installLocation:$PYTHONPATH @@ -58,7 +58,17 @@ INSTALL() mkdir -p $docDir mv $prefix/share/man $manDir + + # install shell completions + mkdir -p $dataDir/bash-completion/completions + mkdir -p $dataDir/zsh/site-functions + cp data/shell-completions/bash/meson $dataDir/bash-completion/completions/meson + cp data/shell-completions/zsh/_meson $dataDir/zsh/site-functions/_meson + + # cleanup rm -rf $prefix/share + rm -rf $docDir + rm -rf $libDir/python3.1 } TEST() diff --git a/dev-util/meson/patches/meson-1.1.0.patchset b/dev-util/meson/patches/meson-1.2.1.patchset similarity index 67% rename from dev-util/meson/patches/meson-1.1.0.patchset rename to dev-util/meson/patches/meson-1.2.1.patchset index cc2dd7a08..269ecf39b 100644 --- a/dev-util/meson/patches/meson-1.1.0.patchset +++ b/dev-util/meson/patches/meson-1.2.1.patchset @@ -1,14 +1,14 @@ -From 9779c98c9d1a4f1a6afb8311d3af02f0a69bfde4 Mon Sep 17 00:00:00 2001 +From 344436c3bf8fdf092a4662b29c1a2d21f074b45a Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 3 Aug 2020 11:56:45 +0200 Subject: Fix include path for boost diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py -index 4ebd88d..e3a1592 100644 +index 0e4dab9..b2b08d6 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py -@@ -523,10 +523,11 @@ class BoostDependency(SystemDependency): +@@ -524,10 +524,11 @@ class BoostDependency(SystemDependency): def detect_inc_dirs(self, root: Path) -> T.List[BoostIncludeDir]: candidates = [] # type: T.List[Path] @@ -25,17 +25,17 @@ index 4ebd88d..e3a1592 100644 2.37.3 -From 9d6c4075e111a2b76834270703bedda6621f8642 Mon Sep 17 00:00:00 2001 +From a58e6eb00a51b4e8bff5ce89ae71552662648512 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 26 Nov 2021 11:39:48 +0100 Subject: add support for gcc 2.95.3 diff --git a/mesonbuild/compilers/detect.py b/mesonbuild/compilers/detect.py -index 6eca155..90af5b0 100644 +index 210ec4d..f7b0c12 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py -@@ -334,7 +334,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin +@@ -339,7 +339,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin version = search_version(out) guess_gcc_or_lcc: T.Optional[str] = None @@ -45,7 +45,7 @@ index 6eca155..90af5b0 100644 if 'e2k' in out and 'lcc' in out: guess_gcc_or_lcc = 'lcc' diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py -index f51460d..edd699a 100644 +index 93b367b..c569098 100644 --- a/mesonbuild/compilers/mixins/gnu.py +++ b/mesonbuild/compilers/mixins/gnu.py @@ -512,7 +512,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta): @@ -57,7 +57,7 @@ index f51460d..edd699a 100644 return [] def get_lto_compile_args(self, *, threads: int = 0, mode: str = 'default') -> T.List[str]: -@@ -650,3 +650,13 @@ class GnuCompiler(GnuLikeCompiler): +@@ -651,3 +651,13 @@ class GnuCompiler(GnuLikeCompiler): def get_profile_use_args(self) -> T.List[str]: return super().get_profile_use_args() + ['-fprofile-correction'] @@ -75,17 +75,17 @@ index f51460d..edd699a 100644 2.37.3 -From 0bbaab52fc15f8db98f9c88080389cb3e04248b9 Mon Sep 17 00:00:00 2001 +From e79a66891167cbf0aaf2d752aad4bbc3818b2860 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Wed, 12 Apr 2023 17:58:48 +0200 Subject: Revert b1384b9c9f64ff909d5431176503a7dcdadd426c diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py -index f26ba77..ce90f2f 100644 +index 63025a5..f320d3c 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py -@@ -701,9 +701,6 @@ class PkgConfigModule(NewExtensionModule): +@@ -703,9 +703,6 @@ class PkgConfigModule(NewExtensionModule): if mesonlib.is_freebsd(): pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'libdata', 'pkgconfig') pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') @@ -98,3 +98,34 @@ index f26ba77..ce90f2f 100644 -- 2.37.3 + +From e8524a296afb38909ea4a25c3a8563a5bc6e5563 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +Date: Sat, 12 Aug 2023 09:56:44 +0100 +Subject: [PATCH 2/2] python module: Respect PATH when python is not given in + machine file + +We should only fall back to the Python interpreter running Meson itself +if `python3` is not found in the PATH. + +https://github.com/mesonbuild/meson/pull/12116 + + +diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py +index ac74e13..a6859d7 100644 +--- a/mesonbuild/modules/python.py ++++ b/mesonbuild/modules/python.py +@@ -370,7 +370,9 @@ class PythonModule(ExtensionModule): + + def _find_installation_impl(self, state: 'ModuleState', display_name: str, name_or_path: str, required: bool) -> ExternalProgram: + if not name_or_path: +- python = PythonExternalProgram('python3', mesonlib.python_command) ++ python = PythonExternalProgram('python3') ++ if not python.found(): ++ python = PythonExternalProgram('python3', mesonlib.python_command) + else: + tmp_python = ExternalProgram.from_entry(display_name, name_or_path) + python = PythonExternalProgram(display_name, ext_prog=tmp_python) +-- +2.37.3 +