0003-Use-a-python-variable-instead-of-hardcoding-Python.patch 3.2 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788
  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. The nodejs build system uses python in a number of locations. However,
  6. there are some locations where it hardcodes 'python' as the Python
  7. interpreter. However, this causes problems when we need to use python2
  8. instead of just python.
  9. This patch fixes that by using the python variable already in place in
  10. the nodejs build system.
  11. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  12. [Martin: adapt to 0.12.5]
  13. Signed-off-by: Martin Bark <martin@barkynet.com>
  14. [yann.morin.1998@free.fr: adapat to 4.1.2]
  15. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  16. ---
  17. deps/v8/tools/gyp/v8.gyp | 8 ++++----
  18. 1 file changed, 4 insertions(+), 4 deletions(-)
  19. diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp
  20. index c703155..06c0b2b 100644
  21. --- a/deps/v8/tools/gyp/v8.gyp
  22. +++ b/deps/v8/tools/gyp/v8.gyp
  23. @@ -1696,14 +1696,14 @@
  24. '<(PRODUCT_DIR)/natives_blob_host.bin',
  25. ],
  26. 'action': [
  27. - 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
  28. + '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
  29. ],
  30. }, {
  31. 'outputs': [
  32. '<(PRODUCT_DIR)/natives_blob.bin',
  33. ],
  34. 'action': [
  35. - 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
  36. + '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
  37. ],
  38. }],
  39. ],
  40. @@ -1712,7 +1712,7 @@
  41. '<(PRODUCT_DIR)/natives_blob.bin',
  42. ],
  43. 'action': [
  44. - 'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
  45. + '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
  46. ],
  47. }],
  48. ],
  49. @@ -1812,7 +1812,7 @@
  50. '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
  51. ],
  52. 'action': [
  53. - 'python',
  54. + '<(python)',
  55. '../../tools/js2c.py',
  56. '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
  57. 'CORE',
  58. @@ -1838,7 +1838,7 @@
  59. '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
  60. ],
  61. 'action': [
  62. - 'python',
  63. + '<(python)',
  64. '../../tools/js2c.py',
  65. '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
  66. 'EXPERIMENTAL',
  67. @@ -1863,7 +1863,7 @@
  68. '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
  69. ],
  70. 'action': [
  71. - 'python',
  72. + '<(python)',
  73. '../../tools/js2c.py',
  74. '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
  75. 'EXTRAS',
  76. @@ -1900,7 +1900,7 @@
  77. '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
  78. ],
  79. 'action': [
  80. - 'python',
  81. + '<(python)',
  82. '../../tools/gen-postmortem-metadata.py',
  83. '<@(_outputs)',
  84. '<@(heapobject_files)'