mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
cb445b3bbd
* chore: bump node in DEPS to v22.15.0 * inspector: fix GN build https://github.com/nodejs/node/pull/56798 * test: search cctest files https://github.com/nodejs/node/pull/56791 * crypto: fix missing OPENSSL_NO_ENGINE guard https://github.com/nodejs/node/pull/57012 * test,crypto: make tests work for BoringSSL https://github.com/nodejs/node/pull/57021 * module: use synchronous hooks for preparsing in import(cjs) https://github.com/nodejs/node/pull/55698 * deps: update simdjson to 3.12.0 https://github.com/nodejs/node/pull/56874 * build: remove explicit linker call to libm on macOS https://github.com/nodejs/node/pull/56901 * test: make eval snapshot comparison more flexible https://github.com/nodejs/node/pull/57020 * src: allow embedder customization of OOMErrorHandler https://github.com/nodejs/node/pull/57325 * src: do not pass nullptr to std::string ctor https://github.com/nodejs/node/pull/57354 * src: lock the isolate properly in IsolateData destructor https://github.com/nodejs/node/pull/57031 * chore: shrink --trace-atomics-wait patch * chore: fixup patch indices * build: fix GN build failure https://github.com/nodejs/node/pull/57013 * crypto: expose security levels https://github.com/nodejs/node/pull/56601 * zlib: add zstd support https://github.com/nodejs/node/pull/52100 * test: move crypto related common utilities in common/crypto https://github.com/nodejs/node/pull/56714 * cli: move --trace-atomics-wait to eol https://github.com/nodejs/node/pull/52747 * test: disable test-https-client-renegotiation-limit BoringSSL doesn't support caller-initiated renegotiation - see https://source.chromium.org/chromium/chromium/src/+/main:third_party/boringssl/src/ssl/ssl_lib.cc;l=1627-1631 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Sun, 17 Nov 2024 22:33:19 +0100
|
|
Subject: build: allow unbundling of Node.js dependencies
|
|
|
|
Linux distributions have guidelines on using distro-provided dependencies,
|
|
rather than compiling them in statically.
|
|
|
|
This PR this enables downstream packagers to unbundle these dependencies.
|
|
We don't need to do this for zlib, as the existing gn workflow uses the same
|
|
//third_party/zlib, so unbundling zlib with Chromium tools in
|
|
//build/linux/unbundle works already. This adds support for some of the others.
|
|
|
|
Upstreamed at https://github.com/nodejs/node/pull/55903
|
|
|
|
diff --git a/unofficial.gni b/unofficial.gni
|
|
index 672e97436d9220e8d5046b0c92025f50ae50a3d8..a8ce18acfe333350f91b3e5f235db5f756b2e34a 100644
|
|
--- a/unofficial.gni
|
|
+++ b/unofficial.gni
|
|
@@ -155,7 +155,6 @@ template("node_gn_build") {
|
|
":run_node_js2c",
|
|
"deps/cares",
|
|
"deps/histogram",
|
|
- "deps/llhttp",
|
|
"deps/nbytes",
|
|
"deps/nghttp2",
|
|
"deps/postject",
|
|
@@ -191,7 +190,17 @@ template("node_gn_build") {
|
|
configs -= [ "//build/config/gcc:symbol_visibility_hidden" ]
|
|
configs += [ "//build/config/gcc:symbol_visibility_default" ]
|
|
}
|
|
-
|
|
+ if (use_system_llhttp) {
|
|
+ libs += [ "llhttp" ]
|
|
+ } else {
|
|
+ deps += [ "deps/llhttp" ]
|
|
+ }
|
|
+ if (use_system_histogram) {
|
|
+ libs += [ "hdr_histogram" ]
|
|
+ include_dirs += [ "/usr/include/hdr" ]
|
|
+ } else {
|
|
+ deps += [ "deps/histogram" ]
|
|
+ }
|
|
if (v8_enable_i18n_support) {
|
|
deps += [ "//third_party/icu" ]
|
|
}
|
|
@@ -219,6 +228,19 @@ template("node_gn_build") {
|
|
sources += node_inspector.node_inspector_sources +
|
|
node_inspector.node_inspector_generated_sources
|
|
}
|
|
+ if (is_linux) {
|
|
+ import("//build/config/linux/pkg_config.gni")
|
|
+ if (use_system_cares) {
|
|
+ pkg_config("cares") {
|
|
+ packages = [ "libcares" ]
|
|
+ }
|
|
+ }
|
|
+ if (use_system_nghttp2) {
|
|
+ pkg_config("nghttp2") {
|
|
+ packages = [ "libnghttp2" ]
|
|
+ }
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
config("zstd_include_config") {
|