pkgs/development/interpreters/spidermonkey/allow-system-s-nspr-and-icu-on-bootstrapped-sysroot.patch

   1 From a26bb162d9403138d64b84e8fa4f0471084c45b2 Mon Sep 17 00:00:00 2001
   2 From: "Kirill A. Korinsky" <kirill@korins.ky>
   3 Date: Fri, 8 Jul 2022 21:21:25 +0200
   4 Subject: [PATCH] Allow system's nspr and icu on bootstrapped sysroot
   5
   6 This patch partially reverts https://github.com/mozilla/gecko-dev/commit/9aa3587bbf0416dd2eb5b614f7b301c71c64286b
   7 ---
   8  build/moz.configure/nspr.configure | 2 +-
   9  js/moz.configure                   | 2 +-
  10  2 files changed, 2 insertions(+), 2 deletions(-)
  11
  12 diff --git a/build/moz.configure/nspr.configure b/build/moz.configure/nspr.configure
  13 index 06f03d9bc72d..9687c84a7290 100644
  14 --- a/build/moz.configure/nspr.configure
  15 +++ b/build/moz.configure/nspr.configure
  16 @@ -19,7 +19,7 @@ def enable_nspr_build(enable):
  17          return enable
  18
  19
  20 -system_lib_option("--with-system-nspr", help="Use system NSPR")
  21 +option("--with-system-nspr", help="Use system NSPR")
  22
  23
  24  @depends(enable_nspr_build, "--with-system-nspr", js_standalone)
  25 diff --git a/js/moz.configure b/js/moz.configure
  26 index b7ba9790425d..5ff5cb2da266 100644
  27 --- a/js/moz.configure
  28 +++ b/js/moz.configure
  29 @@ -1129,7 +1129,7 @@ set_define(
  30
  31  # ECMAScript Internationalization API Support (uses ICU)
  32  # ======================================================
  33 -system_lib_option("--with-system-icu", help="Use system ICU")
  34 +option("--with-system-icu", help="Use system ICU")
  35
  36  system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 71.1", when="--with-system-icu")
  37
  38 --
  39 2.37.0
  40