- rust is not needed tro build pure C++ library

diff --git a/mozjs68.spec b/mozjs68.spec
index 45f0073f1413a5976558fbb17dfb9bb6acfd3687..6f99979c6feedb4918a7759e70350c8b2d011677 100644 (file)
--- a/mozjs68.spec
+++ b/mozjs68.spec
@@ -16,6 +16,7 @@ Patch0:               copy-headers.patch
 Patch1:                system-virtualenv.patch
 Patch2:                include-configure-script.patch
 Patch3:                x32.patch
 Patch1:                system-virtualenv.patch
 Patch2:                include-configure-script.patch
 Patch3:                x32.patch

+Patch4:                no-rust.patch

 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 BuildRequires: autoconf2_13 >= 2.13
 # "TestWrappingOperations.cpp:27:1: error: non-constant condition for static assertion" with -fwrapv on gcc 6 and 7
 URL:           https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey
 BuildRequires: autoconf2_13 >= 2.13
 # "TestWrappingOperations.cpp:27:1: error: non-constant condition for static assertion" with -fwrapv on gcc 6 and 7


@@ -69,6 +70,7 @@ Pliki nagłówkowe do biblioteki JavaScript.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1

+%patch4 -p1

 
 %build
 export PYTHON="%{__python}"
 
 %build
 export PYTHON="%{__python}"

diff --git a/no-rust.patch b/no-rust.patch
new file mode 100644 (file)
index 0000000..9c5df9c
--- /dev/null
+++ b/no-rust.patch
@@ -0,0 +1,14 @@
+--- firefox-68.7.0/js/moz.configure~   2020-04-03 21:29:56.000000000 +0200
++++ firefox-68.7.0/js/moz.configure    2020-05-01 10:20:08.759893678 +0200
+@@ -18,11 +18,6 @@
+ option(env='JS_STANDALONE', default=building_js,
+        help='Reserved for internal use')
+ 
+-include('../build/moz.configure/rust.configure',
+-        when='--enable-compile-environment')
+-include('../build/moz.configure/bindgen.configure',
+-        when='--enable-compile-environment')
+-
+ @depends('JS_STANDALONE')
+ def js_standalone(value):
+     if value: