components/mail/thunderbird/patches/moz.configure_add_illumos.patch

   1 diff --git a/build/autoconf/config.sub b/build/autoconf/config.sub
   2 index 3d9a8dc..2d958b2 100755
   3 --- a/build/autoconf/config.sub
   4 +++ b/build/autoconf/config.sub
   5 @@ -1728,6 +1728,8 @@ case $os in
   6         sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
   7                 # Don't forget version if it is 3.2v4 or newer.
   8                 ;;
   9 +        illumos)
  10 +                ;;
  11         none)
  12                 ;;
  13         *)
  14 diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure
  15 index 3a164c6..f287f5c 100644
  16 --- a/build/moz.configure/init.configure
  17 +++ b/build/moz.configure/init.configure
  18 @@ -716,6 +716,8 @@ def split_triplet(triplet, allow_msvc=False, allow_wasi=False):
  19          canonical_os = canonical_kernel = "OpenBSD"
  20      elif os.startswith("solaris"):
  21          canonical_os = canonical_kernel = "SunOS"
  22 +    elif os.startswith("illumos"):
  23 +        canonical_os = canonical_kernel = "SunOS"
  24      elif os.startswith("wasi") and allow_wasi:
  25          canonical_os = canonical_kernel = "WASI"
  26      else:
  27 @@ -1111,7 +1116,7 @@ def target_is_solaris(target):
  28          return True
  29
  30
  31 -set_define("XP_SOLARIS", target_is_solaris)
  32 +set_define("SOLARIS", target_is_solaris)
  33
  34
  35  @depends(target)
  36 diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py
  37 index 9f7a977..610121f 100644
  38 --- a/python/mozbuild/mozbuild/configure/constants.py
  39 +++ b/python/mozbuild/mozbuild/configure/constants.py
  40 @@ -24,6 +24,7 @@ OS = EnumString.subclass(
  41          "OpenBSD",
  42          "OSX",
  43          "SunOS",
  44 +        "Illumos",
  45          "WINNT",
  46          "WASI",
  47  )
  48 @@ -37,6 +38,7 @@ Kernel = EnumString.subclass(
  49          "NetBSD",
  50          "OpenBSD",
  51          "SunOS",
  52 +        "Illumos",
  53          "WINNT",
  54          "WASI",
  55  )
  56 @@ -113,6 +113,7 @@ kernel_preprocessor_checks = {
  57      "NetBSD": "__NetBSD__",
  58      "OpenBSD": "__OpenBSD__",
  59      "SunOS": "__sun__",
  60 +    "Illumos": "__sun__",
  61      "WINNT": "_WIN32 || __CYGWIN__",
  62      "WASI": "__wasi__",
  63  }
  64 diff --git a/old-configure.in b/old-configure.in
  65 index de2642f..93ac752 100644
  66 --- a/old-configure.in
  67 +++ b/old-configure.in
  68 @@ -825,6 +825,6 @@ case "$target" in
  69      ;;
  70
  71 -*-solaris*)
  72 +*-solaris* | *-illumos*)
  73      MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
  74      ;;
  75
  76 <<<<<<< HEAD
  77 =======
  78 index 77652f6..67235f3 100644
  79 --- a/js/src/old-configure.in
  80 +++ b/js/src/old-configure.in
  81 @@ -701,7 +701,7 @@ case "$target" in
  82      fi
  83      ;;
  84
  85 -*-solaris*)
  86 +*-solaris* | *-illumos*)
  87      MOZ_FIX_LINK_PATHS="-L${DIST}/bin"
  88      ;;
  89
  90 >>>>>>> 960f0c516 (firefox: update 91esr patches)