Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 93f4a93e12
Branches Tags
electron
/
patches
/
node
/
build_allow_unbundling_of_node_js_dependencies.patch

build_allow_unbundling_of_node_js_dependencies.patch 2.1 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Sun, 17 Nov 2024 22:33:19 +0100
    4. 

  4. Subject: build: allow unbundling of Node.js dependencies
    5. 

  5. 

  6. Linux distributions have guidelines on using distro-provided dependencies,
    7. 

  7. rather than compiling them in statically.
    8. 

  8. 

  9. This PR this enables downstream packagers to unbundle these dependencies.
    10. 

  10. We don't need to do this for zlib, as the existing gn workflow uses the same
    11. 

  11. //third_party/zlib, so unbundling zlib with Chromium tools in
    12. 

  12. //build/linux/unbundle works already. This adds support for some of the others.
    13. 

  13. 

  14. Upstreamed at https://github.com/nodejs/node/pull/55903
    15. 

  15. 

  16. diff --git a/unofficial.gni b/unofficial.gni
    17. 

  17. index 08a4ed939fb1482a897def94128282fdfd63dc62..23367db388ce9e83e123d4c6e8c6325266dd52dc 100644
    18. 

  18. --- a/unofficial.gni
    19. 

  19. +++ b/unofficial.gni
    20. 

  20. @@ -153,7 +153,6 @@ template("node_gn_build") {
    21. 

  21.        ":run_node_js2c",
    22. 

  22.        "deps/cares",
    23. 

  23.        "deps/histogram",
    24. 

  24. -      "deps/llhttp",
    25. 

  25.        "deps/nbytes",
    26. 

  26.        "deps/nghttp2",
    27. 

  27.        "deps/postject",
    28. 

  28. @@ -184,7 +183,17 @@ template("node_gn_build") {
    29. 

  29.        configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
    30. 

  30.        configs += [ "//build/config/gcc:symbol_visibility_default" ]
    31. 

  31.      }
    32. 

  32. -
    33. 

  33. +    if (use_system_llhttp) {
    34. 

  34. +      libs += [ "llhttp" ]
    35. 

  35. +    } else {
    36. 

  36. +      deps += [ "deps/llhttp" ]
    37. 

  37. +    }
    38. 

  38. +    if (use_system_histogram) {
    39. 

  39. +      libs += [ "hdr_histogram" ]
    40. 

  40. +      include_dirs += [ "/usr/include/hdr" ]
    41. 

  41. +    } else {
    42. 

  42. +      deps += [ "deps/histogram" ]
    43. 

  43. +    }
    44. 

  44.      if (v8_enable_i18n_support) {
    45. 

  45.        deps += [ "//third_party/icu" ]
    46. 

  46.      }
    47. 

  47. @@ -211,6 +220,19 @@ template("node_gn_build") {
    48. 

  48.        sources += node_inspector.node_inspector_sources +
    49. 

  49.                   node_inspector.node_inspector_generated_sources
    50. 

  50.      }
    51. 

  51. +    if (is_linux) {
    52. 

  52. +      import("//build/config/linux/pkg_config.gni")
    53. 

  53. +        if (use_system_cares) {
    54. 

  54. +          pkg_config("cares") {
    55. 

  55. +            packages = [ "libcares" ]
    56. 

  56. +          }
    57. 

  57. +        }
    58. 

  58. +      if (use_system_nghttp2) {
    59. 

  59. +        pkg_config("nghttp2") {
    60. 

  60. +          packages = [ "libnghttp2" ]
    61. 

  61. +        }
    62. 

  62. +      }
    63. 

  63. +    }
    64. 

  64.    }
    65. 

  65.  
    66. 

  66.    executable(target_name) {
    67.