From 36d22d82aa202bb199967e9512281e9a53db42c9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 21:33:14 +0200 Subject: Adding upstream version 115.7.0esr. Signed-off-by: Daniel Baumann --- config/make-system-wrappers.py | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 config/make-system-wrappers.py (limited to 'config/make-system-wrappers.py') diff --git a/config/make-system-wrappers.py b/config/make-system-wrappers.py new file mode 100644 index 0000000000..a4b3d51af1 --- /dev/null +++ b/config/make-system-wrappers.py @@ -0,0 +1,38 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +import os + +from mozbuild.util import FileAvoidWrite + +header_template = """#pragma GCC system_header +#pragma GCC visibility push(default) +{includes} +#pragma GCC visibility pop +""" + +include_next_template = "#include_next <{header}>" + + +# The 'unused' arg is the output file from the file_generate action. We actually +# generate all the files in header_list +def gen_wrappers(unused, outdir, *header_list): + for header in header_list: + with FileAvoidWrite(os.path.join(outdir, header)) as f: + includes = include_next_template.format(header=header) + if header == "wayland-util.h": + # wayland-util.h in Wayland < 1.12 includes math.h inside an + # extern "C" block, which breaks including the header from C++. + # This was fixed in Wayland 1.12, but for versions earlier than + # that, we work around that by force-including math.h first. + includes = "#include \n" + includes + elif header == "wayland-client.h": + # The system wayland-client.h uses quote includes for + # wayland-util.h, which means wayland-util.h is picked from the + # directory containing wayland-client.h first, and there's no + # way around that with -I, -isystem, or other flags. So, we + # force to include it from our wrapper, before including the + # system header, so that our wayland-util.h wrapper is picked + # first. + includes = '#include "wayland-util.h"\n' + includes + f.write(header_template.format(includes=includes)) -- cgit v1.2.3