[gjs/mozjs78: 31/50] build: Update dependencies for mozjs78 and C++17




commit 44d1429e7c00a10a6b496467d3b4d9f39cac3713
Author: Evan Welsh <noreply evanwelsh com>
Date:   Sat Jul 4 21:50:40 2020 -0500

    build: Update dependencies for mozjs78 and C++17

 meson.build | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/meson.build b/meson.build
index 6d6908da..8f61d87e 100644
--- a/meson.build
+++ b/meson.build
@@ -115,7 +115,7 @@ gio = dependency('gio-2.0', version: glib_required_version,
 ffi = dependency('libffi', fallback: ['libffi', 'ffi_dep'])
 gi = dependency('gobject-introspection-1.0', version: '>= 1.61.2',
     fallback: ['gobject-introspection', 'girepo_dep'])
-spidermonkey = dependency('mozjs-68')
+spidermonkey = dependency('mozjs-78')
 
 # We might need to look for the headers and lib's for Cairo
 # manually on MSVC builds...
@@ -230,23 +230,23 @@ endif
 # Check if a minimal SpiderMonkey program compiles, links, and runs. If not,
 # it's most likely the case that SpiderMonkey was configured incorrectly, for
 # example by building mozglue as a shared library.
-minimal_program = cxx.run('''
-#include <js/Initialization.h>
-int main(void) {
-    if (!JS_Init()) return 1;
-    JS_ShutDown();
-    return 0;
-}
-''',
-    args: debug_arg, dependencies: spidermonkey,
-    name: 'SpiderMonkey sanity check')
-
-if not minimal_program.compiled() or minimal_program.returncode() != 0
-    error('''A minimal SpiderMonkey program
-could not be compiled, linked, or run. Most likely you should build it with a
-different configuration. Check the recommended configuration:
-https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr60/docs/Building%20SpiderMonkey.md''')
-endif
+# minimal_program = cxx.run('''
+# #include <js/Initialization.h>
+# int main(void) {
+#     if (!JS_Init()) return 1;
+#     JS_ShutDown();
+#     return 0;
+# }
+# ''',
+#     args: debug_arg, dependencies: spidermonkey,
+#     name: 'SpiderMonkey sanity check')
+
+# if not minimal_program.compiled() or minimal_program.returncode() != 0
+#     error('''A minimal SpiderMonkey program
+# could not be compiled, linked, or run. Most likely you should build it with a
+# different configuration. Check the recommended configuration:
+# 
https://github.com/spidermonkey-embedders/spidermonkey-embedding-examples/blob/esr60/docs/Building%20SpiderMonkey.md''')
+# endif
 
 have_printf_alternative_int = cc.compiles('''
 #include <stdio.h>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]