mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 04:00:05 +02:00
meson: fix searching for boost
This commit is contained in:
@@ -7,6 +7,7 @@ LICENSE="Apache v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="0a1ae2bfe2ae14ac47593537f93290fb79e9b775c55b4c53c282bc3ca3745b35"
|
||||
PATCHES="meson-$portVersion.patchset"
|
||||
PYTHON_VERSION="3.7"
|
||||
|
||||
ARCHITECTURES="any"
|
||||
|
||||
26
dev-util/meson/patches/meson-0.55.0.patchset
Normal file
26
dev-util/meson/patches/meson-0.55.0.patchset
Normal file
@@ -0,0 +1,26 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user