Add Cargo Feature for zlib-rs (#619)

* Switched to Using zlib-rs

Signed-off-by: Redfire <[email protected]>

* Added Cargo Feature for zlib-rs

Signed-off-by: Redfire <[email protected]>

* Updated Patches for zlib-rs

Signed-off-by: Redfire <[email protected]>

---------

Signed-off-by: Redfire <[email protected]>

Author: redfire75369

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-1"
+version = "0.140.0-2"
 authors = ["Mozilla"]
 links = "mozjs"
 license.workspace = true
@@ -25,19 +25,23 @@ doctest = false
 debugmozjs = []
 profilemozjs = []
 jitspew = []
+libz-sys = ["dep:libz-sys"]
+libz-rs = ["dep:libz-rs-sys"]
 crown = []
 oom_with_hook = []
 
 [dependencies]
 libc.workspace = true
-# SM depends on them and we provide them using cargo
-libz-sys = "1.1.19"
 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"] }
 
+libz-rs-sys = { version = "0.5.1", features = ["export-symbols"], optional = true }
+# SM depends on them and we provide them using cargo
+libz-sys = { version = "1.1.19", default-features = false, features = ["libc", "stock-zlib"], optional = true }
+
 [build-dependencies]
 bindgen.workspace = true
 cc.workspace = true

mozjs-sys/build.rs

@@ -187,23 +187,32 @@ fn build_spidermonkey(build_dir: &Path) {
         encoding_c_mem_include_dir.replace("\\", "/")
     ));
 
-    // add zlib.pc into pkg-config's search path
-    // this is only needed when libz-sys builds zlib from source
-    if let Ok(zlib_root_dir) = env::var("DEP_Z_ROOT") {
-        let mut pkg_config_path = OsString::from(format!(
-            "{}/lib/pkgconfig",
-            zlib_root_dir.replace("\\", "/")
-        ));
-        if let Some(env_pkg_config_path) = get_cc_rs_env_os("PKG_CONFIG_PATH") {
-            pkg_config_path.push(":");
-            pkg_config_path.push(env_pkg_config_path);
+    if cfg!(all(feature = "libz-rs", feature = "libz-sys")) {
+        panic!("Cannot enable both 'libz-rs' and 'libz-sys' features at the same time. Choose only one.");
+    } else if cfg!(not(any(feature = "libz-rs", feature = "libz-sys"))) {
+        panic!("Must enable one of the 'libz-rs' or 'libz-sys' features.");
+    }
+
+    if cfg!(feature = "libz-sys") {
+        // add zlib.pc into pkg-config's search path
+        // this is only needed when libz-sys builds zlib from source
+        if let Ok(zlib_root_dir) = env::var("DEP_Z_ROOT") {
+            let mut pkg_config_path = OsString::from(format!(
+                "{}/lib/pkgconfig",
+                zlib_root_dir.replace("\\", "/")
+            ));
+            if let Some(env_pkg_config_path) = get_cc_rs_env_os("PKG_CONFIG_PATH") {
+                pkg_config_path.push(":");
+                pkg_config_path.push(env_pkg_config_path);
+            }
+            cmd.env("PKG_CONFIG_PATH", pkg_config_path);
         }
-        cmd.env("PKG_CONFIG_PATH", pkg_config_path);
-    }
 
-    if let Ok(include) = env::var("DEP_Z_INCLUDE") {
-        write!(cppflags, "-I{} ", include.replace("\\", "/")).unwrap();
+        if let Ok(include) = env::var("DEP_Z_INCLUDE") {
+            write!(cppflags, "-I{} ", include.replace("\\", "/")).unwrap();
+        }
     }
+
     cppflags.push(get_cc_rs_env_os("CPPFLAGS").unwrap_or_default());
     cmd.env("CPPFLAGS", cppflags);
 

mozjs-sys/etc/filters.txt

@@ -34,7 +34,12 @@
 - /testing/mozbase/rust
 - /third_party/rust
 - /Cargo.toml
-- /modules/zlib
+
+# Keep zlib headers for libz-rs-sys
++ modules/zlib/src/
++ modules/zlib/src/zlib.h
++ modules/zlib/src/zconf.h
+- modules/zlib/**
 
 # Remove unused python dependency that also causes problems with case-sensitive filesystems.
 - /third_party/python/Jinja2

mozjs-sys/etc/get_latest_mozjs.sh

@@ -2,7 +2,7 @@
 
 REPO=mozilla-release
 
-# get commit and appropriet mozjs tar
+# get commit and appropriate mozjs tar
 jobs=( $(curl "https://treeherder.mozilla.org/api/project/$REPO/push/?full=true&count=20" | jq '.results[].id') )
 for i in "${jobs[@]}"
 do

mozjs-sys/etc/get_taskcluster_mozjs.sh

@@ -1,28 +1,28 @@
 diff --git a/config/external/zlib/moz.build b/config/external/zlib/moz.build
-index 755400fa7..d1311b9a7 100644
+index c2b9847e6..99bd2b121 100644
 --- a/config/external/zlib/moz.build
 +++ b/config/external/zlib/moz.build
-@@ -6,9 +6,4 @@
+@@ -8,7 +8,8 @@ Library("zlib")
 
- Library("zlib")
- 
--if CONFIG["MOZ_SYSTEM_ZLIB"]:
--    OS_LIBS += CONFIG["MOZ_ZLIB_LIBS"]
--else:
+ if CONFIG["MOZ_SYSTEM_ZLIB"]:
+     OS_LIBS += CONFIG["MOZ_ZLIB_LIBS"]
+ else:
 -    DIRS += [
 -        "../../../modules/zlib",
 -    ]
-+OS_LIBS += CONFIG["MOZ_ZLIB_LIBS"]
++    EXPORTS += [
++        "../../../modules/zlib/src/zconf.h",
++        "../../../modules/zlib/src/zlib.h",
++    ]
 diff --git a/moz.configure b/moz.configure
-index 804b9a375..87ccc508d 100755
+index dd419e1cc..8d618342c 100755
 --- a/moz.configure
 +++ b/moz.configure
-@@ -891,50 +891,8 @@ check_prog(
+@@ -890,51 +890,23 @@ check_prog(
      validate=validate_strip,
  )
 
-+pkg_check_modules("MOZ_ZLIB", "zlib >= 1.2.3", when=use_pkg_config)
- 
+-
 -@depends(js_standalone, target)
 -def system_zlib_default(js_standalone, target):
 -    return (
@@ -32,20 +32,29 @@ index 804b9a375..87ccc508d 100755
 -    )
 -
 -
--option(
+ option(
 -    "--with-system-zlib",
 -    nargs="?",
 -    default=system_zlib_default,
 -    help="{Use|Do not use} system libz",
 -    when=use_pkg_config,
--)
--
--
++    "--enable-libz-rs",
++    help="Use libz-rs instead of system libz",
+ )
+ 
++@depends("--enable-libz-rs")
++def use_libz_rs(enabled):
++    return enabled
+ 
 -@depends("--with-system-zlib", when=use_pkg_config)
 -def with_system_zlib_option(with_system_zlib):
 -    return with_system_zlib
--
--
++@depends(use_libz_rs)
++def use_system_zlib(libz_rs):
++    return not libz_rs
+ 
++pkg_check_modules("MOZ_ZLIB", "zlib >= 1.2.3", when=use_system_zlib)
+ 
 -@depends(with_system_zlib_option)
 -def deprecated_system_zlib_path(value):
 -    if value and len(value) == 1:
@@ -67,7 +76,22 @@ index 804b9a375..87ccc508d 100755
 -)
 -
 -set_config("USE_LIBZ_RS", True, when="USE_LIBZ_RS")
-+set_config("MOZ_SYSTEM_ZLIB", True)
++set_config("MOZ_SYSTEM_ZLIB", True, when=use_system_zlib)
++set_config("USE_LIBZ_RS", True, when=use_libz_rs)
 
  with only_when(cross_compiling):
-     option(
+     option(
+diff --git a/modules/zlib/src/zconf.h b/modules/zlib/src/zconf.h
+index c6305ec3d..62adc8d84 100644
+--- a/modules/zlib/src/zconf.h
++++ b/modules/zlib/src/zconf.h
+@@ -8,9 +8,6 @@
+ #ifndef ZCONF_H
+ #define ZCONF_H
+ 
+-/* This header does prefixing as below, but with an updated set of names. */
+-#include "mozzconf.h"
+-
+ /*
+  * If you *really* need a unique prefix for all types and library functions,
+  * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.

mozjs-sys/etc/patches/0033-no-zlib.patch mozjs-sys/etc/patches/0033-zlib.patchmozjs-sys/etc/patches/0033-no-zlib.patch renamed to mozjs-sys/etc/patches/0033-zlib.patch

@@ -23,6 +23,10 @@ ifneq (,$(CARGO_FEATURE_PROFILEMOZJS))
 	CONFIGURE_FLAGS += --enable-profiling
 endif
 
+ifneq (,$(CARGO_FEATURE_LIBZ_RS))
+	CONFIGURE_FLAGS += --enable-libz-rs
+endif
+
 ifneq (,$(CCACHE))
 	CONFIGURE_FLAGS += --with-ccache=$(CCACHE)
 endif