Mercurial > vanilla

annotate dev/meson/patch-clang.patch @ 1340:6c658efb7387

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
audio/alsa-lib: upgrade to 1.2.6.1
author David Demelier <markand@malikania.fr>
date Wed, 22 Dec 2021 20:51:15 +0100
parents e22e50e381d0
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1310
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 # Adding -isystem breaks build as it conflicts with clang's own headers.
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 --- a/mesonbuild/dependencies/base.py
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 +++ b/mesonbuild/dependencies/base.py
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 @@ -109,8 +109,9 @@
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 if self.include_type == 'system':
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 converted = []
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 for i in self.compile_args:
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 + # vanilla os: we don't use -isystem as it breaks clang.
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 if i.startswith('-I') or i.startswith('/I'):
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 - converted += ['-isystem' + i[2:]]
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 + converted += ['-I' + i[2:]]
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 else:
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 converted += [i]
e22e50e381d0 dev/meson: disable -isystem
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 return converted