haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
master
haikuports/dev-build/meson/patches/meson-1.10.0.patchset
OscarL 0d192f4061 meson: update to version 1.10.0. (#13349)
2025-12-09 08:53:02 -03:00

158 lines
6.5 KiB
Plaintext
Raw Permalink Blame History

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 1aeb451..d03387d 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -538,10 +538,11 @@ class BoostDependency(SystemDependency):
def detect_inc_dirs(self, root: Path) -> T.List[BoostIncludeDir]:
candidates: T.List[Path] = []
- inc_root = root / 'include'
+ inc_root = root / 'headers'
candidates += [root / 'boost']
candidates += [inc_root / 'boost']
+ candidates += [inc_root / 'x86' / 'boost']
if inc_root.is_dir():
for i in inc_root.iterdir():
if not i.is_dir() or not i.name.startswith('boost-'):
--
2.51.0
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 db2bdf6..3a8aebd 100644
--- a/mesonbuild/compilers/detect.py
+++ b/mesonbuild/compilers/detect.py
@@ -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
- if 'Free Software Foundation' in out or out.startswith('xt-'):
+ if 'Free Software Foundation' in out or out.startswith('xt-') or '2.95.3' in out:
guess_gcc_or_lcc = 'gcc'
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 7e783e2..a117b10 100644
--- a/mesonbuild/compilers/mixins/gnu.py
+++ b/mesonbuild/compilers/mixins/gnu.py
@@ -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, *, 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'):
+ vistype = ''
+ return super().gnu_symbol_visibility_args(vistype)
+
+ def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
+ if mesonlib.version_compare(self.version, '< 4'):
+ return []
+ return super().get_dependency_gen_args(outtarget, outfile)
+
class GnuCStds(Compiler):
--
2.51.0
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 7d5bc91..e5a4b91 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -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')
- elif m.is_haiku():
- pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('prefix'))), 'develop', 'lib', 'pkgconfig')
- pkgroot_name = os.path.join('{prefix}', 'develop', 'lib', 'pkgconfig')
else:
pkgroot = os.path.join(_as_str(state.environment.coredata.optstore.get_value_for(OptionKey('libdir'))), 'pkgconfig')
pkgroot_name = os.path.join('{libdir}', 'pkgconfig')
--
2.51.0
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
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 99602c0..450e2ec 100644
--- a/mesonbuild/modules/python.py
+++ b/mesonbuild/modules/python.py
@@ -460,7 +460,9 @@ class PythonModule(ExtensionModule):
build_config = self.interpreter.environment.coredata.optstore.get_value_for(OptionKey('python.build_config'))
if not name_or_path:
- 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, build_config_path=build_config)
else:
tmp_python = ExternalProgram.from_entry(display_name, name_or_path)
python = PythonExternalProgram(display_name, ext_prog=tmp_python, build_config_path=build_config)
--
2.51.0
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 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
windows_syms(impfilename, outfilename)
else:
dummy_syms(outfilename)
- elif mesonlib.is_linux() or mesonlib.is_hurd():
+ elif mesonlib.is_linux() or mesonlib.is_hurd() or mesonlib.is_haiku():
gnu_syms(libfilename, outfilename)
elif mesonlib.is_osx():
osx_syms(libfilename, outfilename)
--
2.51.0
Reference in New Issue View Git Blame Copy Permalink