diff --git a/dev-util/meson/meson-0.55.0.recipe b/dev-util/meson/meson-0.55.0.recipe index bd3d01b24..71eb8a8d0 100644 --- a/dev-util/meson/meson-0.55.0.recipe +++ b/dev-util/meson/meson-0.55.0.recipe @@ -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" diff --git a/dev-util/meson/patches/meson-0.55.0.patchset b/dev-util/meson/patches/meson-0.55.0.patchset new file mode 100644 index 000000000..51abcf79b --- /dev/null +++ b/dev-util/meson/patches/meson-0.55.0.patchset @@ -0,0 +1,26 @@ +From a13e7560a5908353b32f7a1151ce0e7ad792316b 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 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 +