package/nodejs/5.3.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch

   1 From 4a48c65921b0f05b621aef5b902b6aa54811ad7a Mon Sep 17 00:00:00 2001
   2 From: Martin Bark <martin@barkynet.com>
   3 Date: Tue, 30 Jun 2015 09:44:33 +0100
   4 Subject: [PATCH 3/4] Use a python variable instead of hardcoding Python
   5
   6 The nodejs build system uses python in a number of locations. However,
   7 there are some locations where it hardcodes 'python' as the Python
   8 interpreter. However, this causes problems when we need to use python2
   9 instead of just python.
  10
  11 This patch fixes that by using the python variable already in place in
  12 the nodejs build system.
  13
  14 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  15 [Martin: adapt to 0.12.5]
  16 Signed-off-by: Martin Bark <martin@barkynet.com>
  17 [yann.morin.1998@free.fr: adapt to 4.1.2]
  18 Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  19 ---
  20  deps/v8/tools/gyp/v8.gyp | 8 ++++----
  21  1 file changed, 4 insertions(+), 4 deletions(-)
  22
  23 diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp
  24 index c703155..06c0b2b 100644
  25 --- a/deps/v8/tools/gyp/v8.gyp
  26 +++ b/deps/v8/tools/gyp/v8.gyp
  27 @@ -1696,14 +1696,14 @@
  28                        '<(PRODUCT_DIR)/natives_blob_host.bin',
  29                      ],
  30                      'action': [
  31 -                      'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
  32 +                      '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
  33                      ],
  34                    }, {
  35                      'outputs': [
  36                        '<(PRODUCT_DIR)/natives_blob.bin',
  37                      ],
  38                      'action': [
  39 -                      'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
  40 +                      '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
  41                      ],
  42                    }],
  43                  ],
  44 @@ -1712,7 +1712,7 @@
  45                    '<(PRODUCT_DIR)/natives_blob.bin',
  46                  ],
  47                  'action': [
  48 -                  'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
  49 +                  '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
  50                  ],
  51                }],
  52              ],
  53 @@ -1812,7 +1812,7 @@
  54              '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
  55            ],
  56            'action': [
  57 -            'python',
  58 +            '<(python)',
  59              '../../tools/js2c.py',
  60              '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
  61              'CORE',
  62 @@ -1838,7 +1838,7 @@
  63              '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
  64            ],
  65            'action': [
  66 -            'python',
  67 +            '<(python)',
  68              '../../tools/js2c.py',
  69              '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
  70              'EXPERIMENTAL',
  71 @@ -1863,7 +1863,7 @@
  72              '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
  73            ],
  74            'action': [
  75 -            'python',
  76 +            '<(python)',
  77              '../../tools/js2c.py',
  78              '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
  79              'EXTRAS',
  80 @@ -1900,7 +1900,7 @@
  81                '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
  82              ],
  83              'action': [
  84 -              'python',
  85 +              '<(python)',
  86                '../../tools/gen-postmortem-metadata.py',
  87                '<@(_outputs)',
  88                '<@(heapobject_files)'
  89 diff --git a/deps/v8/build/toolchain.gypi b/deps/v8/build/toolchain.gypi
  90 index c703155..06c0b2b 100644
  91 --- a/deps/v8/build/toolchain.gypi
  92 +++ b/deps/v8/build/toolchain.gypi
  93 @@ -38,7 +38,7 @@
  94      'ubsan%': 0,
  95      'ubsan_vptr%': 0,
  96      'v8_target_arch%': '<(target_arch)',
  97 -    'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
  98 +    'v8_host_byteorder%': '<!(<(python) -c "import sys; print sys.byteorder")',
  99      # Native Client builds currently use the V8 ARM JIT and
 100      # arm/simulator-arm.cc to defer the significant effort required
 101      # for NaCl JIT support. The nacl_target_arch variable provides