Support build configurations without Intl API (#623)

* Support build configurations without Intl API

The Intl API requires bundling a very large amount of data, and isn't needed in absolutely all environments.

This commit introduces an `intl` feature, which is enabled by default on `mozjs`, and builds SpiderMonkey without Intl support if that feature is disabled.

On MacOS, a mozjs embedding I'm working on shrinks from 32MB to 12MB, and a wasm32 build from also 32MB to 8.5MB (all stripped).

Signed-off-by: Till Schneidereit <[email protected]>

* Always build from source if intl feature is disabled

Signed-off-by: Till Schneidereit <[email protected]>

* Bump `mozjs-sys` version

Signed-off-by: Till Schneidereit <[email protected]>

---------

Signed-off-by: Till Schneidereit <[email protected]>

Author: tschneidereit

mozjs-sys/Cargo.toml

@@ -2,7 +2,7 @@
 name = "mozjs_sys"
 description = "System crate for the Mozilla SpiderMonkey JavaScript engine."
 repository.workspace = true
-version = "0.140.0-4"
+version = "0.140.0-5"
 authors = ["Mozilla", "The Servo Project Developers"]
 links = "mozjs"
 license.workspace = true
@@ -26,6 +26,7 @@ profilemozjs = []
 jitspew = []
 libz-sys = ["dep:libz-sys"]
 libz-rs = ["dep:libz-rs-sys"]
+intl = ["dep:icu_capi"]
 crown = []
 oom_with_hook = []
 
@@ -35,7 +36,7 @@ encoding_c = "0.9.8"
 encoding_c_mem = "0.2.6"
 # unicode-bidi-ffi = { path = "./mozjs/intl/bidi/rust/unicode-bidi-ffi" }
 # keep in sync with intl/icu_capi/Cargo.toml
-icu_capi = { version = "=1.5.0", default-features = false, features = ["compiled_data", "icu_calendar", "icu_properties", "icu_segmenter"] }
+icu_capi = { version = "=1.5.0", default-features = false, features = ["compiled_data", "icu_calendar", "icu_properties", "icu_segmenter"], optional = true }
 
 libz-rs-sys = { version = "0.5.1", features = ["export-symbols"], optional = true }
 # SM depends on them and we provide them using cargo

mozjs-sys/build.rs

@@ -224,9 +224,13 @@ fn build_spidermonkey(build_dir: &Path) {
         cmd.env("MAKEFLAGS", makeflags);
     }
 
-    let icu_c_include_path = get_icu_capi_include_path();
     let mut cxxflags = vec![];
-    cxxflags.push(format!("-I{}", &icu_c_include_path.replace("\\", "/")));
+
+    #[cfg(feature = "intl")]
+    {
+        let icu_c_include_path = get_icu_capi_include_path();
+        cxxflags.push(format!("-I{}", &icu_c_include_path.replace("\\", "/")));
+    }
 
     if target.contains("apple") || target.contains("freebsd") || target.contains("ohos") {
         cxxflags.push(String::from("-stdlib=libc++"));
@@ -460,6 +464,9 @@ fn should_build_from_source() -> bool {
     } else if env::var_os("CARGO_FEATURE_DEBUGMOZJS").is_some() {
         println!("debug-mozjs feature is enabled. Building from source directly.");
         true
+    } else if env::var_os("CARGO_FEATURE_INTL").is_none() {
+        println!("intl feature is disabled. Building from source directly.");
+        true
     } else {
         false
     }

mozjs-sys/makefile.cargo

@@ -15,6 +15,10 @@ ifneq (,$(CARGO_FEATURE_JITSPEW))
     CONFIGURE_FLAGS += --enable-jitspew
 endif
 
+ifeq (,$(CARGO_FEATURE_INTL))
+    CONFIGURE_FLAGS += --without-intl-api
+endif
+
 ifneq (,$(CARGO_FEATURE_DEBUGMOZJS))
 	CONFIGURE_FLAGS += --enable-debug --disable-optimize --enable-gczeal
 endif

mozjs-sys/src/lib.rs

@@ -10,6 +10,7 @@
 // These extern crates are needed for linking
 extern crate encoding_c;
 extern crate encoding_c_mem;
+#[cfg(feature = "intl")]
 extern crate icu_capi;
 #[cfg(feature = "libz-rs")]
 extern crate libz_rs_sys;

mozjs/Cargo.toml

@@ -11,12 +11,13 @@ edition.workspace = true
 doctest = false
 
 [features]
-default = ["libz-sys"]
+default = ["libz-sys", "intl"]
 debugmozjs = ["mozjs_sys/debugmozjs"]
 profilemozjs = ["mozjs_sys/profilemozjs"]
 jitspew = ["mozjs_sys/jitspew"]
 libz-sys = ["mozjs_sys/libz-sys"]
 libz-rs = ["mozjs_sys/libz-rs"]
+intl = ["mozjs_sys/intl"]
 crown = ["mozjs_sys/crown"]