[gjs: 1/2] meson: fix version check for precompiled headers
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs: 1/2] meson: fix version check for precompiled headers
- Date: Sat, 10 Jul 2021 04:29:10 +0000 (UTC)
commit 77cf3b0be1b66365efc588903576eaa94e595491
Author: Jordan Petridis <jordan centricular com>
Date: Sat Jul 10 05:08:38 2021 +0300
meson: fix version check for precompiled headers
The dependent PR [1] for meson was/has not been back ported
to the 0.58 branch and didn't make the 0.58.1 release,
causing the build to fail.
https://github.com/mesonbuild/meson/pull/8740
followup from !620
```
[42/120] Compiling C++ object libgjs-internal.a.p/gi_boxed.cpp.o
FAILED: libgjs-internal.a.p/gi_boxed.cpp.o
g++ -Ilibgjs-internal.a.p -I. -I.. -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-I/usr/include/sysprof-4 -I/usr/include/libmount -I/usr/include/blkid
-I/usr/include/gobject-introspection-1.0 -I/usr/include/cairo -I/usr/include/pixman-1
-I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/libxml2
-fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -Wextra -std=c++17
-fno-rtti -g -fno-strict-aliasing -Wno-variadic-macros -Wno-missing-field-initializers
-fno-semantic-interposition -fPIC -isystem/usr/include/sysprof-4 -pthread -include
/usr/include/mozjs-78/js/RequiredDefines.h -isystem /usr/include/mozjs-78 -DGJS_COMPILATION
'-DGJS_JS_DIR="/usr/local/share/gjs-1.0"' '-DPKGLIBDIR="/usr/local/lib64/gjs"' '-DG_LOG_DOMAIN="Gjs"'
-fpch-preprocess -include gjs_pch.hh -MD -MQ libgjs-internal.a.p/gi_boxed.cpp.o -MF
libgjs-internal.a.p/gi_boxed.cpp.o.d -o libgjs-internal.a.p/gi_boxed.cpp.o -c ../gi/boxed.cpp
<command-line>: fatal error: gjs_pch.hh: No such file or directory
compilation terminated.
```
meson.build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 1a8a0b63..8db5a9c1 100644
--- a/meson.build
+++ b/meson.build
@@ -495,9 +495,9 @@ if host_machine.system() == 'windows'
endif
pch_headers = ['gjs/gjs_pch.hh']
-if get_option('b_pch') and not meson.version().version_compare('>= 0.58.1')
+if get_option('b_pch') and not meson.version().version_compare('>= 0.59.0')
if cxx.get_id() == 'gcc'
- warning('Precompiled headers not supported with g++ and meson versions earlier than 0.58.1')
+ warning('Precompiled headers not supported with g++ and meson versions earlier than 0.59.0')
pch_headers = []
endif
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]