From 9354b831d82b93924d6a43a91c89828d4ac4698c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Tue, 10 Dec 2024 18:47:10 +0100 Subject: [PATCH] meson: bump version --- ...{meson-1.2.1.recipe => meson-1.6.0.recipe} | 4 +- ...on-1.2.1.patchset => meson-1.6.0.patchset} | 52 +++++++++---------- 2 files changed, 27 insertions(+), 29 deletions(-) rename dev-build/meson/{meson-1.2.1.recipe => meson-1.6.0.recipe} (93%) rename dev-build/meson/patches/{meson-1.2.1.patchset => meson-1.6.0.patchset} (78%) diff --git a/dev-build/meson/meson-1.2.1.recipe b/dev-build/meson/meson-1.6.0.recipe similarity index 93% rename from dev-build/meson/meson-1.2.1.recipe rename to dev-build/meson/meson-1.6.0.recipe index 4fb3de88b..b5b84da7e 100644 --- a/dev-build/meson/meson-1.2.1.recipe +++ b/dev-build/meson/meson-1.6.0.recipe @@ -2,11 +2,11 @@ SUMMARY="A High productivity build system" DESCRIPTION="Meson® is a project to create the best possible next-generation \ build system." HOMEPAGE="https://mesonbuild.com/" -COPYRIGHT="2013-2023 The Meson development team" +COPYRIGHT="2013-2024 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="b1db3a153087549497ee52b1c938d2134e0338214fe14f7efd16fecd57b639f5" +CHECKSUM_SHA256="999b65f21c03541cf11365489c1fad22e2418bb0c3d50ca61139f2eec09d5496" PATCHES="meson-$portVersion.patchset" PYTHON_VERSION="3.10" diff --git a/dev-build/meson/patches/meson-1.2.1.patchset b/dev-build/meson/patches/meson-1.6.0.patchset similarity index 78% rename from dev-build/meson/patches/meson-1.2.1.patchset rename to dev-build/meson/patches/meson-1.6.0.patchset index 269ecf39b..3fa47cd63 100644 --- a/dev-build/meson/patches/meson-1.2.1.patchset +++ b/dev-build/meson/patches/meson-1.6.0.patchset @@ -1,17 +1,17 @@ -From 344436c3bf8fdf092a4662b29c1a2d21f074b45a Mon Sep 17 00:00:00 2001 +From c1f80629d151a63d6e24d2ba7840c3e630580039 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 0e4dab9..b2b08d6 100644 +index 870c0b1..a4ce80b 100644 --- a/mesonbuild/dependencies/boost.py +++ b/mesonbuild/dependencies/boost.py -@@ -524,10 +524,11 @@ class BoostDependency(SystemDependency): +@@ -516,10 +516,11 @@ class BoostDependency(SystemDependency): def detect_inc_dirs(self, root: Path) -> T.List[BoostIncludeDir]: - candidates = [] # type: T.List[Path] + candidates: T.List[Path] = [] - inc_root = root / 'include' + inc_root = root / 'headers' @@ -22,20 +22,20 @@ index 0e4dab9..b2b08d6 100644 for i in inc_root.iterdir(): if not i.is_dir() or not i.name.startswith('boost-'): -- -2.37.3 +2.45.2 -From a58e6eb00a51b4e8bff5ce89ae71552662648512 Mon Sep 17 00:00:00 2001 +From af13ba200399e8efbed29d74dcb141a744bdffb6 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 210ec4d..f7b0c12 100644 +index 7542fb6..84a9a60 100644 --- a/mesonbuild/compilers/detect.py +++ b/mesonbuild/compilers/detect.py -@@ -339,7 +339,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin +@@ -333,7 +333,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,10 +45,10 @@ index 210ec4d..f7b0c12 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 93b367b..c569098 100644 +index 62f5554..2425f0d 100644 --- a/mesonbuild/compilers/mixins/gnu.py +++ b/mesonbuild/compilers/mixins/gnu.py -@@ -512,7 +512,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta): +@@ -489,7 +489,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta): stdo = self._get_search_dirs(env) for line in stdo.split('\n'): if line.startswith(name + ':'): @@ -57,7 +57,7 @@ index 93b367b..c569098 100644 return [] def get_lto_compile_args(self, *, threads: int = 0, mode: str = 'default') -> T.List[str]: -@@ -651,3 +651,13 @@ class GnuCompiler(GnuLikeCompiler): +@@ -628,3 +628,13 @@ class GnuCompiler(GnuLikeCompiler): def get_profile_use_args(self) -> T.List[str]: return super().get_profile_use_args() + ['-fprofile-correction'] @@ -72,52 +72,50 @@ index 93b367b..c569098 100644 + return [] + return super().get_dependency_gen_args(outtarget, outfile) -- -2.37.3 +2.45.2 -From e79a66891167cbf0aaf2d752aad4bbc3818b2860 Mon Sep 17 00:00:00 2001 +From 47569bdcc9bb2dfb2ed94308c836644e586ac731 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 63025a5..f320d3c 100644 +index 1bdf829..afe2770 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py -@@ -703,9 +703,6 @@ class PkgConfigModule(NewExtensionModule): +@@ -704,9 +704,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 = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'libdata', 'pkgconfig') pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig') - elif mesonlib.is_haiku(): -- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') +- pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig') - pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig') else: - pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(mesonlib.OptionKey('libdir'))), 'pkgconfig') + pkgroot = os.path.join(_as_str(state.environment.coredata.get_option(OptionKey('libdir'))), 'pkgconfig') pkgroot_name = os.path.join('{libdir}', 'pkgconfig') -- -2.37.3 +2.45.2 -From e8524a296afb38909ea4a25c3a8563a5bc6e5563 Mon Sep 17 00:00:00 2001 +From 86a4f5f5c529e71ba4a1efcf0fea170a96f983e8 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 +Subject: 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 +index 1b7a056..3d87c58 100644 --- a/mesonbuild/modules/python.py +++ b/mesonbuild/modules/python.py -@@ -370,7 +370,9 @@ class PythonModule(ExtensionModule): +@@ -442,7 +442,9 @@ class PythonModule(ExtensionModule): - def _find_installation_impl(self, state: 'ModuleState', display_name: str, name_or_path: str, required: bool) -> ExternalProgram: + def _find_installation_impl(self, state: 'ModuleState', display_name: str, name_or_path: str, required: bool) -> MaybePythonProg: if not name_or_path: - python = PythonExternalProgram('python3', mesonlib.python_command) + python = PythonExternalProgram('python3') @@ -127,5 +125,5 @@ index ac74e13..a6859d7 100644 tmp_python = ExternalProgram.from_entry(display_name, name_or_path) python = PythonExternalProgram(display_name, ext_prog=tmp_python) -- -2.37.3 +2.45.2