[packages/mozjs91] - try with updated x32-rust patch
qboosh
qboosh at pld-linux.org
Tue Apr 5 18:23:44 CEST 2022
commit c4492a5f4b361d89eeeffb44c63179dccbdd49a6
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue Apr 5 18:23:43 2022 +0200
- try with updated x32-rust patch
mozjs-x32-rust.patch | 42 +++++++++++++++++++++++++++---------------
mozjs91.spec | 2 +-
2 files changed, 28 insertions(+), 16 deletions(-)
---
diff --git a/mozjs91.spec b/mozjs91.spec
index 758a7b9..1d1e799 100644
--- a/mozjs91.spec
+++ b/mozjs91.spec
@@ -80,7 +80,7 @@ Pliki nagłówkowe do biblioteki JavaScript.
%patch2 -p1
%patch3 -p1
%ifarch x32
-#%patch4 -p1
+%patch4 -p1
%endif
%patch5 -p1
diff --git a/mozjs-x32-rust.patch b/mozjs-x32-rust.patch
index b9747de..d8e38fe 100644
--- a/mozjs-x32-rust.patch
+++ b/mozjs-x32-rust.patch
@@ -1,19 +1,31 @@
---- firefox-78.2.0/build/moz.configure/rust.configure.orig 2020-08-17 20:33:34.000000000 +0200
-+++ firefox-78.2.0/build/moz.configure/rust.configure 2020-10-07 18:29:15.458050574 +0200
-@@ -406,16 +406,6 @@
- rust_host_triple = rust_triple_alias(host, host_c_compiler)
-
-
-- at depends(host, rust_host_triple, rustc_info.host)
--def validate_rust_host_triple(host, rust_host, rustc_host):
-- if rust_host != rustc_host:
-- if host.alias == rust_host:
+--- firefox-91.7.1/build/moz.configure/rust.configure.orig 2022-03-13 15:31:36.000000000 +0100
++++ firefox-91.7.1/build/moz.configure/rust.configure 2022-04-05 18:19:56.821912735 +0200
+@@ -462,28 +462,6 @@ def rust_host_triple(
+ rustc_target = detect_rustc_target(
+ host, compiler_info, arm_target, rust_supported_targets
+ )
+- if rustc_target != rustc_host:
+- if host.alias == rustc_target:
- configure_host = host.alias
- else:
-- configure_host = '{}/{}'.format(host.alias, rust_host)
-- die("The rust compiler host ({}) is not suitable for the configure host ({})."
-- .format(rustc_host, configure_host))
+- configure_host = "{}/{}".format(host.alias, rustc_target)
+- die(
+- dedent(
+- """\
+- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}).
-
+- You can solve this by:
+- * Set your configure host to match the rust compiler host by editing your
+- mozconfig and adding "ac_add_options --host={rustc}".
+- * Or, install the rust toolchain for {configure}, if supported, by running
+- "rustup default stable-{rustc_target}"
+- """.format(
+- rustc=rustc_host,
+- configure=configure_host,
+- rustc_target=rustc_target,
+- )
+- )
+- )
+ assert_rust_compile(host, rustc_target, rustc)
+ return rustc_target
- set_config('RUST_TARGET', rust_target_triple)
- set_config('RUST_HOST_TARGET', rust_host_triple)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mozjs91.git/commitdiff/c4492a5f4b361d89eeeffb44c63179dccbdd49a6
More information about the pld-cvs-commit
mailing list