You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

97 lines
3.2 KiB

  1. --- a/deps/zlib/zlib.gyp
  2. +++ b/deps/zlib/zlib.gyp
  3. @@ -43,10 +43,12 @@
  4. 'zutil.c',
  5. 'zutil.h',
  6. ],
  7. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  8. 'include_dirs': [
  9. '.',
  10. ],
  11. 'direct_dependent_settings': {
  12. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  13. 'include_dirs': [
  14. '.',
  15. ],
  16. --- a/tools/v8_gypfiles/v8.gyp
  17. +++ b/tools/v8_gypfiles/v8.gyp
  18. @@ -60,6 +60,7 @@
  19. ],
  20. 'hard_dependency': 1,
  21. 'direct_dependent_settings': {
  22. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  23. 'include_dirs': [
  24. '<(SHARED_INTERMEDIATE_DIR)',
  25. ],
  26. @@ -195,6 +196,7 @@
  27. '<@(torque_outputs_cc)',
  28. '<@(torque_outputs_inc)',
  29. ],
  30. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  31. 'include_dirs': [
  32. '<(SHARED_INTERMEDIATE_DIR)',
  33. ],
  34. @@ -216,6 +218,7 @@
  35. 'sources': [
  36. '<(generate_bytecode_builtins_list_output)',
  37. ],
  38. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  39. 'include_dirs': [
  40. '<(generate_bytecode_output_root)',
  41. '<(SHARED_INTERMEDIATE_DIR)',
  42. @@ -266,9 +269,11 @@
  43. 'v8_base_without_compiler',
  44. 'v8_shared_internal_headers',
  45. ],
  46. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  47. 'include_dirs': [
  48. '<(SHARED_INTERMEDIATE_DIR)',
  49. '<(generate_bytecode_output_root)',
  50. + '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
  51. ],
  52. 'sources': [
  53. '<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "\\"v8_initializers.*?sources = ")',
  54. @@ -793,6 +798,7 @@
  55. ],
  56. 'includes': ['inspector.gypi'],
  57. 'direct_dependent_settings': {
  58. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  59. 'include_dirs': [
  60. '<(generate_bytecode_output_root)',
  61. '<(SHARED_INTERMEDIATE_DIR)',
  62. @@ -1384,6 +1390,7 @@
  63. }],
  64. ],
  65. 'direct_dependent_settings': {
  66. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  67. 'include_dirs': [
  68. '<(V8_ROOT)/include',
  69. ],
  70. @@ -1748,6 +1755,7 @@
  71. }],
  72. ],
  73. 'direct_dependent_settings': {
  74. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  75. 'include_dirs': [
  76. '<(V8_ROOT)/include',
  77. ],
  78. @@ -1934,15 +1942,19 @@
  79. }],
  80. ],
  81. 'direct_dependent_settings': {
  82. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  83. 'include_dirs': [
  84. '<(V8_ROOT)/third_party/zlib',
  85. '<(V8_ROOT)/third_party/zlib/google',
  86. + '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
  87. ],
  88. },
  89. 'defines': [ 'ZLIB_IMPLEMENTATION' ],
  90. + 'include_dirs!': [ '<!@(echo "$STAGING_DIR"/usr/include)' ],
  91. 'include_dirs': [
  92. '<(V8_ROOT)/third_party/zlib',
  93. '<(V8_ROOT)/third_party/zlib/google',
  94. + '<!@(echo "$STAGING_DIR"/usr/../usr/include)',
  95. ],
  96. 'sources': [
  97. '<(V8_ROOT)/third_party/zlib/adler32.c',