package/develop/mozjs/uname-wrapper.patch

   1 # --- T2-COPYRIGHT-NOTE-BEGIN ---
   2 # T2 SDE: package/*/mozjs/uname-wrapper.patch
   3 # Copyright (C) 2014 - 2024 The T2 SDE Project
   4 #
   5 # This Copyright note is generated by scripts/Create-CopyPatch,
   6 # more information can be found in the files COPYING and README.
   7 #
   8 # This patch file is dual-licensed. It is available under the license the
   9 # patched project is licensed under, as long as it is an OpenSource license
  10 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  11 # of the GNU General Public License version 2 as used by the T2 SDE.
  12 # --- T2-COPYRIGHT-NOTE-END ---
  13
  14 The Python scripts fail with warning output on stderr, ...
  15
  16         - Rene Rebe <rene@exactcode.de>
  17
  18 --- firefox-64.0/toolkit/crashreporter/google-breakpad/src/build/common.gypi.vanilla    2019-02-25 19:45:27.366949238 +0100
  19 +++ firefox-64.0/toolkit/crashreporter/google-breakpad/src/build/common.gypi    2019-02-25 19:45:36.998949638 +0100
  20 @@ -46,7 +46,7 @@
  21              # else gets passed through, which probably won't work very well; such
  22              # hosts should pass an explicit target_arch to gyp.
  23              'host_arch%':
  24 -              '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/")',
  25 +              '<!(uname -m 2>/dev/null | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/")',
  26            }, {  # OS!="linux"
  27              'host_arch%': 'ia32',
  28            }],
  29 --- firefox-64.0/build/gyp_includes/common.gypi.vanilla 2019-02-25 19:47:09.190953460 +0100
  30 +++ firefox-64.0/build/gyp_includes/common.gypi 2019-02-25 19:47:19.606953891 +0100
  31 @@ -117,7 +117,7 @@
  32              # Anything else gets passed through, which probably won't work very
  33              # well; such hosts should pass an explicit target_arch to gyp.
  34              'host_arch%':
  35 -              '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
  36 +              '<!(uname -m 2>/dev/null | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/;s/i86pc/ia32/")',
  37            }],
  38
  39            # Set default value of toolkit_views based on OS.