diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
| commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
| tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /build/moz.configure | |
| parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
| download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip | |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'build/moz.configure')
| -rw-r--r-- | build/moz.configure/bootstrap.configure | 2 | ||||
| -rw-r--r-- | build/moz.configure/init.configure | 13 | ||||
| -rw-r--r-- | build/moz.configure/nss.configure | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/build/moz.configure/bootstrap.configure b/build/moz.configure/bootstrap.configure index d8deddbb9e..6e8e59812f 100644 --- a/build/moz.configure/bootstrap.configure +++ b/build/moz.configure/bootstrap.configure @@ -132,7 +132,7 @@ def bootstrap_path(path, **kwargs): @imports("os") @imports("subprocess") @imports("sys") - @imports(_from="mozbuild.util", _import="ensureParentDir") + @imports(_from="mozbuild.dirutils", _import="ensureParentDir") @imports(_from="importlib", _import="import_module") @imports(_from="shutil", _import="rmtree") @imports(_from="__builtin__", _import="open") diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index bfb878aebb..5ff6851e86 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -1271,6 +1271,19 @@ def enabled_in_nightly(milestone): return milestone.is_nightly +# Check if we need the 32-bit Linux SSE2 error dialog +# =================================================== +option( + env="MOZ_LINUX_32_SSE2_STARTUP_ERROR", + help="Add code to perform startup checks to warn if SSE2 is not available", + default=depends("MOZ_AUTOMATION")(lambda x: bool(x)), + when=target_is_unix & depends(target)(lambda target: target.cpu == "x86"), +) +set_config( + "MOZ_LINUX_32_SSE2_STARTUP_ERROR", True, when="MOZ_LINUX_32_SSE2_STARTUP_ERROR" +) + + # Branding # ============================================================== option( diff --git a/build/moz.configure/nss.configure b/build/moz.configure/nss.configure index 2765a6502d..33ff47b3b1 100644 --- a/build/moz.configure/nss.configure +++ b/build/moz.configure/nss.configure @@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", help="Use system NSS") imply_option("--with-system-nspr", True, when="--with-system-nss") nss_pkg = pkg_check_modules( - "NSS", "nss >= 3.99", when="--with-system-nss", config=False + "NSS", "nss >= 3.100", when="--with-system-nss", config=False ) set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss") |