mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
meson: update to version 1.10.0. (#13349)
This commit is contained in:
OscarL
GitHub
@@ -4,9 +4,9 @@ build system."
|
||||
HOMEPAGE="https://mesonbuild.com/"
|
||||
COPYRIGHT="2013-2025 The Meson development team"
|
||||
LICENSE="Apache v2"
|
||||
REVISION="2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="4e076606f2afff7881d195574bddcd8d89286f35a17b4977a216f535dc0c74ac"
|
||||
CHECKSUM_SHA256="8071860c1f46a75ea34801490fd1c445c9d75147a65508cd3a10366a7006cc1c"
|
||||
PATCHES="meson-$portVersion.patchset"
|
||||
|
||||
pythonVersion=3.10
|
||||
@@ -1,14 +1,14 @@
|
||||
From 73c3c93c5b88f857d3f501b769895ac1988e2b5a Mon Sep 17 00:00:00 2001
|
||||
From faaeadf958088b0003b1f020d2a49ce84eab7c90 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
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 fdb35d4..eaa3688 100644
|
||||
index 1aeb451..d03387d 100644
|
||||
--- a/mesonbuild/dependencies/boost.py
|
||||
+++ b/mesonbuild/dependencies/boost.py
|
||||
@@ -539,10 +539,11 @@ class BoostDependency(SystemDependency):
|
||||
@@ -538,10 +538,11 @@ class BoostDependency(SystemDependency):
|
||||
|
||||
def detect_inc_dirs(self, root: Path) -> T.List[BoostIncludeDir]:
|
||||
candidates: T.List[Path] = []
|
||||
@@ -25,17 +25,17 @@ index fdb35d4..eaa3688 100644
|
||||
2.51.0
|
||||
|
||||
|
||||
From b5dde43198368ec6dd4b7e0fbc630e602ec57cee Mon Sep 17 00:00:00 2001
|
||||
From 0f5997a2abf39d76cff1272fe1725d807747951a Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
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 f57957f..db3162c 100644
|
||||
index db2bdf6..3a8aebd 100644
|
||||
--- a/mesonbuild/compilers/detect.py
|
||||
+++ b/mesonbuild/compilers/detect.py
|
||||
@@ -336,7 +336,7 @@ def _detect_c_or_cpp_compiler(env: 'Environment', lang: str, for_machine: Machin
|
||||
@@ -346,7 +346,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,21 +45,21 @@ index f57957f..db3162c 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 ddcd14a..d78e575 100644
|
||||
index 7e783e2..a117b10 100644
|
||||
--- a/mesonbuild/compilers/mixins/gnu.py
|
||||
+++ b/mesonbuild/compilers/mixins/gnu.py
|
||||
@@ -488,7 +488,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
|
||||
stdo = self._get_search_dirs(env)
|
||||
@@ -478,7 +478,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
|
||||
stdo = self._get_search_dirs()
|
||||
for line in stdo.split('\n'):
|
||||
if line.startswith(name + ':'):
|
||||
- return self._split_fetch_real_dirs(line.split('=', 1)[1])
|
||||
+ return self._split_fetch_real_dirs(line.split('=', 1)[1] if '=' in line else line)
|
||||
return []
|
||||
|
||||
def get_lto_compile_args(self, *, threads: int = 0, mode: str = 'default') -> T.List[str]:
|
||||
@@ -634,6 +634,16 @@ class GnuCompiler(GnuLikeCompiler):
|
||||
def get_profile_use_args(self) -> T.List[str]:
|
||||
return super().get_profile_use_args() + ['-fprofile-correction']
|
||||
def get_lto_compile_args(self, *, target: T.Optional[BuildTarget] = None, threads: int = 0,
|
||||
@@ -662,6 +662,16 @@ class GnuCompiler(GnuLikeCompiler):
|
||||
args += ['-Zomf']
|
||||
return super().get_always_args() + args
|
||||
|
||||
+ def gnu_symbol_visibility_args(self, vistype: str) -> T.List[str]:
|
||||
+ if mesonlib.version_compare(self.version, '< 4'):
|
||||
@@ -78,17 +78,17 @@ index ddcd14a..d78e575 100644
|
||||
2.51.0
|
||||
|
||||
|
||||
From 39928ce216e8776f17d632ec7454dae1549e584b Mon Sep 17 00:00:00 2001
|
||||
From 4d1ee4d30985903f72678c352c266565644a9c66 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
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 8eb382b..c639e8e 100644
|
||||
index 7d5bc91..e5a4b91 100644
|
||||
--- a/mesonbuild/modules/pkgconfig.py
|
||||
+++ b/mesonbuild/modules/pkgconfig.py
|
||||
@@ -723,9 +723,6 @@ class PkgConfigModule(NewExtensionModule):
|
||||
@@ -735,9 +735,6 @@ class PkgConfigModule(NewExtensionModule):
|
||||
if m.is_freebsd():
|
||||
pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'libdata', 'pkgconfig')
|
||||
pkgroot_name = os.path.join('{prefix}', 'libdata', 'pkgconfig')
|
||||
@@ -102,7 +102,7 @@ index 8eb382b..c639e8e 100644
|
||||
2.51.0
|
||||
|
||||
|
||||
From 56a0beb07a2783c26aa6d3eca5984257619d5149 Mon Sep 17 00:00:00 2001
|
||||
From abc06d903c2baaa653392940e53c698fa253a827 Mon Sep 17 00:00:00 2001
|
||||
From: James Le Cuirot <chewi@gentoo.org>
|
||||
Date: Sat, 12 Aug 2023 09:56:44 +0100
|
||||
Subject: python module: Respect PATH when python is not given in machine file
|
||||
@@ -113,32 +113,34 @@ 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 3c07960..c4a353b 100644
|
||||
index 99602c0..450e2ec 100644
|
||||
--- a/mesonbuild/modules/python.py
|
||||
+++ b/mesonbuild/modules/python.py
|
||||
@@ -440,7 +440,9 @@ class PythonModule(ExtensionModule):
|
||||
@@ -460,7 +460,9 @@ class PythonModule(ExtensionModule):
|
||||
build_config = self.interpreter.environment.coredata.optstore.get_value_for(OptionKey('python.build_config'))
|
||||
|
||||
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')
|
||||
- python = PythonExternalProgram('python3', mesonlib.python_command, build_config_path=build_config)
|
||||
+ python = PythonExternalProgram('python3', build_config_path=build_config)
|
||||
+ if not python.found():
|
||||
+ python = PythonExternalProgram('python3', mesonlib.python_command)
|
||||
+ python = PythonExternalProgram('python3', mesonlib.python_command, build_config_path=build_config)
|
||||
else:
|
||||
tmp_python = ExternalProgram.from_entry(display_name, name_or_path)
|
||||
python = PythonExternalProgram(display_name, ext_prog=tmp_python)
|
||||
python = PythonExternalProgram(display_name, ext_prog=tmp_python, build_config_path=build_config)
|
||||
--
|
||||
2.51.0
|
||||
|
||||
|
||||
From 325d5efd5055b67b0c81b021b1d0ee75767bf282 Mon Sep 17 00:00:00 2001
|
||||
From 731c0e058726f491919eadfe51350c4566acbbca Mon Sep 17 00:00:00 2001
|
||||
From: Oscar Lesta <oscar.lesta@gmail.com>
|
||||
Date: Thu, 4 Dec 2025 07:38:46 -0300
|
||||
Subject: Use gnu_sym() for symbol extraction.
|
||||
|
||||
Upstreamed in https://github.com/mesonbuild/meson/pull/15352
|
||||
(merged in commit: 49b2c202b8f48451fb594e6501bb31930fa9e616)
|
||||
|
||||
diff --git a/mesonbuild/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py
|
||||
index b0a07d9..d57a219 100644
|
||||
index c0aa650..3ceea4b 100644
|
||||
--- a/mesonbuild/scripts/symbolextractor.py
|
||||
+++ b/mesonbuild/scripts/symbolextractor.py
|
||||
@@ -273,7 +273,7 @@ def gen_symbols(libfilename: str, impfilename: str, outfilename: str, cross_host
|
||||
Reference in New Issue
Block a user