diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/gjs/gjs')
-rw-r--r-- | meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch | 19 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch | 23 |
2 files changed, 20 insertions, 22 deletions
diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch index 55af681af0..12b4b08c7e 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch +++ b/meta-gnome/recipes-gnome/gjs/gjs/0001-Support-cross-builds-a-bit-better.patch @@ -1,4 +1,4 @@ -From 550e98013b0e003c1a6771d8e811375913adf16b Mon Sep 17 00:00:00 2001 +From 8a78a7996b01aba21377ceb7547da673fd30a391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Wed, 27 Oct 2021 20:18:47 +0200 Subject: [PATCH] Support cross builds a bit better @@ -9,7 +9,7 @@ Content-Transfer-Encoding: 8bit * Do not build/run mozjs-linked program * Do not try to run test applications -Upstream-Status: Submitted[https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- @@ -17,10 +17,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index dfcc2c3..192b1b5 100644 +index c9b26d6..3058e8c 100644 --- a/meson.build +++ b/meson.build -@@ -234,6 +234,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with +@@ -262,6 +262,7 @@ release builds of SpiderMonkey. Try configuring SpiderMonkey with --disable-debug.''') endif @@ -28,15 +28,15 @@ index dfcc2c3..192b1b5 100644 # 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. -@@ -254,6 +255,7 @@ 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/esr78/docs/Building%20SpiderMonkey.md''') +@@ -292,6 +293,7 @@ elif minimal_program.returncode() != 0 + failed to execute. Most likely you should build it with a different + configuration.''' + recommended_configuration) endif +endif # not meson.is_cross_build() have_printf_alternative_int = cc.compiles(''' #include <stdio.h> -@@ -662,7 +664,7 @@ endif +@@ -690,7 +692,7 @@ subdir('installed-tests') # Note: The test program in test/ needs to be ported # to Windows before we can build it on Windows. @@ -45,6 +45,3 @@ index dfcc2c3..192b1b5 100644 subdir('test') endif --- -2.31.1 - diff --git a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch index 8777d14f53..e932f06d27 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch +++ b/meta-gnome/recipes-gnome/gjs/gjs/0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch @@ -1,13 +1,17 @@ -From 6a29818204e647d5fad68ed7ca8cac53d301cae6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +From 29221ae42e424c6100b8c313d2b61801430c872d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller=20installed=5Ftests=20is=20false?= + <schnitzeltony@gmail.com> Date: Wed, 27 Oct 2021 20:04:02 +0200 Subject: [PATCH] meson.build: Do not add dir installed-tests when - installed_tests is false MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Upstream-Status: Submitted[https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/690] Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> --- @@ -15,12 +19,12 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 6878e2e..edbbf79 100644 +index 3058e8c..06cf8da 100644 --- a/meson.build +++ b/meson.build -@@ -635,7 +635,9 @@ if not get_option('skip_gtk_tests') - have_gtk4 = dependency('gtk4', required: false).found() - endif +@@ -688,7 +688,9 @@ endif + + ### Tests and test setups ###################################################### -subdir('installed-tests') +if get_option('installed_tests') @@ -29,6 +33,3 @@ index 6878e2e..edbbf79 100644 # Note: The test program in test/ needs to be ported # to Windows before we can build it on Windows. --- -2.31.1 - |