Mercurial > vanilla

changeset 1310:e22e50e381d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dev/meson: disable -isystem
author David Demelier <markand@malikania.fr>
date Fri, 19 Nov 2021 21:46:26 +0100
parents 66d3e04b22e6
children 131def02577e
files dev/meson/meson.sh dev/meson/patch-clang.patch
diffstat 2 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dev/meson/meson.sh	Fri Nov 19 21:45:27 2021 +0100
+++ b/dev/meson/meson.sh	Fri Nov 19 21:46:26 2021 +0100
@@ -29,6 +29,7 @@
 	tar -xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
+	patch -p1 < ../patch-clang.patch
 	python setup.py build
 	python setup.py install --root=${DESTDIR:-/} --prefix=/. -O1
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dev/meson/patch-clang.patch	Fri Nov 19 21:46:26 2021 +0100
@@ -0,0 +1,14 @@
+# Adding -isystem breaks build as it conflicts with clang's own headers.
+--- a/mesonbuild/dependencies/base.py
++++ b/mesonbuild/dependencies/base.py
+@@ -109,8 +109,9 @@
+         if self.include_type == 'system':
+             converted = []
+             for i in self.compile_args:
++                # vanilla os: we don't use -isystem as it breaks clang.
+                 if i.startswith('-I') or i.startswith('/I'):
+-                    converted += ['-isystem' + i[2:]]
++                    converted += ['-I' + i[2:]]
+                 else:
+                     converted += [i]
+             return converted