mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

build: allow Linux distros to build against system shared libraries (#34841)

Browse source 
* build: allow Linux distros to build against system shared libraries

Add GN flags to build the embedded nodejs copy against system libraries
instead of vendored copies in `third_party/electron_node/deps`:

* cares
* llhttp
* nghttp2
* hdr_histogram

See also chromium's build/linux/unbundle/README for more
Electron-relevant information about vendored dependencies.

* Update patches/node/build_add_gn_build_files.patch

Co-authored-by: Darshan Sen <raisinten@gmail.com>

Co-authored-by: Darshan Sen <raisinten@gmail.com>
This commit is contained in:
Bruno Pitrus 2022-08-17 04:50:15 +02:00 committed by GitHub
parent 947f1b0abf
commit 8e4a168a13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 43 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
patches/node/build_add_gn_build_files.patch
View file

@ -7,10 +7,10 @@ This adds GN build files for Node, so we don't have to build with GYP.
diff --git a/BUILD.gn b/BUILD.gn diff --git a/BUILD.gn b/BUILD.gn
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..9e34a074cfa7dec61c4e11821ba5f1969f393dfb index 0000000000000000000000000000000000000000..3ae9b93649bb404fbf04dea52ecaa7d664ff03ee
--- /dev/null --- /dev/null
+++ b/BUILD.gn +++ b/BUILD.gn
@@ -0,0 +1,403 @@ @@ -0,0 +1,440 @@
+import("//v8/gni/v8.gni") +import("//v8/gni/v8.gni")
+import("node.gni") +import("node.gni")
+ +
@ -53,6 +53,26 @@ index 0000000000000000000000000000000000000000..9e34a074cfa7dec61c4e11821ba5f196
+ +
+ # Allows embedders to override the NODE_MODULE_VERSION define + # Allows embedders to override the NODE_MODULE_VERSION define
+ node_module_version = "" + node_module_version = ""
+
+ # Allows downstream packagers (eg. Linux distributions) to build Electron against system shared libraries.
+ use_system_cares = false
+ use_system_nghttp2 = false
+ use_system_llhttp = false
+ use_system_histogram = false
+}
+
+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" ]
+ }
+ }
+} +}
+ +
+assert(!node_use_dtrace, "node_use_dtrace not supported in GN") +assert(!node_use_dtrace, "node_use_dtrace not supported in GN")
@ -204,17 +224,23 @@ index 0000000000000000000000000000000000000000..9e34a074cfa7dec61c4e11821ba5f196
+component("node_lib") { +component("node_lib") {
+ deps = [ + deps = [
+ ":node_js2c", + ":node_js2c",
+ "deps/cares",
+ "deps/histogram",
+ "deps/googletest:gtest", + "deps/googletest:gtest",
+ "deps/llhttp",
+ "deps/nghttp2",
+ "deps/uvwasi", + "deps/uvwasi",
+ "//third_party/zlib", + "//third_party/zlib",
+ "//third_party/brotli:dec", + "//third_party/brotli:dec",
+ "//third_party/brotli:enc", + "//third_party/brotli:enc",
+ "//v8:v8_libplatform", + "//v8:v8_libplatform",
+ ] + ]
+ if (use_system_cares) {
+ configs += [ ":cares" ]
+ } else {
+ deps += [ "deps/cares" ]
+ }
+ if (use_system_nghttp2) {
+ configs += [ ":nghttp2" ]
+ } else {
+ deps += [ "deps/nghttp2" ]
+ }
+ public_deps = [ + public_deps = [
+ "deps/uv", + "deps/uv",
+ "//electron:electron_js2c", + "//electron:electron_js2c",
@ -224,6 +250,17 @@ index 0000000000000000000000000000000000000000..9e34a074cfa7dec61c4e11821ba5f196
+ public_configs = [ ":node_lib_config" ] + public_configs = [ ":node_lib_config" ]
+ include_dirs = [ "src" ] + include_dirs = [ "src" ]
+ libs = [] + libs = []
+ 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" ]
+ }
+ frameworks = [] + frameworks = []
+ cflags_cc = [ + cflags_cc = [
+ "-Wno-deprecated-declarations", + "-Wno-deprecated-declarations",