package/www/firefox/uname-wrapper.patch

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