haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 04:00:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: bump version

Browse Source 
add support for gcc 2.95.3
This commit is contained in:
Jerome Duval
2021-11-26 12:29:16 +01:00
parent 967de252e4
commit e0dfeb481d
3 changed files with 77 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dev-util/meson/meson-0.58.0.recipe → dev-util/meson/meson-0.60.2.recipe
View File

@@ -6,7 +6,7 @@ COPYRIGHT="2013-2020 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="f4820df0bc969c99019fd4af8ca5f136ee94c63d8a5ad67e7eb73bdbc9182fdd"
CHECKSUM_SHA256="64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921"
PATCHES="meson-$portVersion.patchset"
PYTHON_VERSION="3.7"

26
dev-util/meson/patches/meson-0.58.0.patchset
View File

@@ -1,26 +0,0 @@
From a13e7560a5908353b32f7a1151ce0e7ad792316b 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 907c0c2..ca5ad8a 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -491,10 +491,11 @@ class BoostDependency(ExternalDependency):
def detect_inc_dirs(self, root: Path) -> T.List[BoostIncludeDir]:
candidates = [] # type: 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.27.0

76
dev-util/meson/patches/meson-0.60.2.patchset Normal file
View File

@@ -0,0 +1,76 @@
From 3ec1af7c0f6d364c92767f33f80c1d35a0ee8445 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 aadf3f8..f2bf548 100644
--- a/mesonbuild/dependencies/boost.py
+++ b/mesonbuild/dependencies/boost.py
@@ -518,10 +518,11 @@ class BoostDependency(SystemDependency):
def detect_inc_dirs(self, root: Path) -> T.List[BoostIncludeDir]:
candidates = [] # type: 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.30.2
From c409a002f24e708a031cdc912f2554547e57fdb2 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 1eacecf..e7d7937 100644
--- a/mesonbuild/compilers/detect.py
+++ b/mesonbuild/compilers/detect.py
@@ -415,7 +415,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 'xt-' in out:
+ if 'Free Software Foundation' in out or 'xt-' in out 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 bc40af4..65bbe08 100644
--- a/mesonbuild/compilers/mixins/gnu.py
+++ b/mesonbuild/compilers/mixins/gnu.py
@@ -280,7 +280,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
stdo = self._get_search_dirs(env)
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]:
@@ -396,3 +396,13 @@ class GnuCompiler(GnuLikeCompiler):
elif threads > 0:
return [f'-flto={threads}']
return super().get_lto_compile_args(threads=threads)
+
+ 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)
--
2.30.2