Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nodejs-electron for openSUSE:Factory
checked in at 2022-07-07 12:57:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nodejs-electron (Old)
and /work/SRC/openSUSE:Factory/.nodejs-electron.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nodejs-electron"
Thu Jul 7 12:57:38 2022 rev:28 rq:987386 version:19.0.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/nodejs-electron/nodejs-electron.changes
2022-07-05 12:09:24.492550526 +0200
+++
/work/SRC/openSUSE:Factory/.nodejs-electron.new.1523/nodejs-electron.changes
2022-07-07 12:58:17.287405746 +0200
@@ -1,0 +2,13 @@
+Wed Jul 6 21:57:42 UTC 2022 - Bruno Pitrus <[email protected]>
+- New upstream release 19.0.8
+ * Updated Chromium to 102.0.5005.148
+ * Fixed an issue where DataList bounds had part of the item text cut off
vertically.
+- Add disable-catapult.patch
+ * This nukular solution from Debian avoids building telemetry code which was
causing hangs during build on Rawhide.
+- Add chromium-103.0.5060.53-python3-do-not-use-deprecated-mode-U.patch
+ * Fixes build with python 3.11
+- Use system llhttp and HDR-Histogram on all Fedora versions
+- Additionally use system abseil, aom, dav1d, spirv on Fedora 37 Rawhide
+- Fix bundled crc32c headers incorrectly getting used instead of system ones.
+
+-------------------------------------------------------------------
Old:
----
electron-19.0.7.tar.xz
New:
----
chromium-103.0.5060.53-python3-do-not-use-deprecated-mode-U.patch
disable-catapult.patch
electron-19.0.8.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nodejs-electron.spec ++++++
--- /var/tmp/diff_new_pack.ejujLi/_old 2022-07-07 12:58:30.819425732 +0200
+++ /var/tmp/diff_new_pack.ejujLi/_new 2022-07-07 12:58:30.823425739 +0200
@@ -98,7 +98,11 @@
%bcond_without system_freetype
# requires 3.4 (not in factory yet)
+%if 0%{?fedora} >= 37
+%bcond_without system_aom
+%else
%bcond_with system_aom
+%endif
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500 ||
0%{?fedora_version}
%bcond_without system_crc32c
@@ -123,7 +127,7 @@
%bcond_with system_nvctrl
%endif
-%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150500 || 0%{?fedora} >=
37
%bcond_without system_spirv
%else
%bcond_with system_spirv
@@ -145,8 +149,12 @@
%if 0%{?fedora}
%bcond_without system_jxl
+%bcond_without system_llhttp
+%bcond_without system_histogram
%else
%bcond_with system_jxl
+%bcond_with system_llhttp
+%bcond_with system_histogram
%endif
%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400 || 0%{?fedora}
@@ -166,11 +174,24 @@
%bcond_with system_abseil
%endif
+# We always ship the following bundled libraries as part of Electron despite a
system version being available in either openSUSE or Fedora:
+# Name | Path in tarball | Reason
+#
-------------+-----------------------------------+---------------------------------------
+# boringssl | third_party/boringssl | The openSUSE package is
unmaintained.
+# flatbuffers | third_party/flatbuffers | The static library is
only used during build, only header code is present in the Chromium binary.
+# hunspell | third_party/hunspell/src | Fork.
+# leveldb | third_party/leveldatabase/src | Internal api use.
+# protobuf | third_party/protobuf | Fork.
+# rnnoise | third_party/rnnoise | Internal api use.
+# sqlite | third_party/sqlite | Fork.
+# srtp / srtp2 | third_party/libsrtp | Api matches neither
version 1 nor 2 of this library.
+# uv | third_party/electron_node/deps/uv | Heavily modified version
which is exposed as part of Electron's public ABI.
+# yuv | third_party/libyuv | Version in Fedora
(0-0.43.20201024git19d71f6) is too old.
Name: nodejs-electron
-Version: 19.0.7
+Version: 19.0.8
Release: 0
Summary: Build cross platform desktop apps with JavaScript, HTML, and
CSS
License: MIT
@@ -313,6 +334,10 @@
#
https://salsa.debian.org/chromium-team/chromium/-/blob/456851fc808b2a5b5c762921699994e957645917/debian/patches/upstream/nested-nested-nested-nested-nested-nested-regex-patterns.patch
Patch64: nested-nested-nested-nested-nested-nested-regex-patterns.patch
Patch65: base-system-nspr.patch
+# PATCH-FIX-UPSTREAM ??? Fedora patch to fix build with python3.11
+Patch66:
chromium-103.0.5060.53-python3-do-not-use-deprecated-mode-U.patch
+# from
https://sources.debian.org/patches/chromium/103.0.5060.53-1/disable/catapult.patch/
+Patch67: disable-catapult.patch
%if %{with clang}
BuildRequires: clang
BuildRequires: lld
@@ -336,12 +361,18 @@
BuildRequires: git-core
BuildRequires: gn >= 0.1807
BuildRequires: gperf
+%if %{with system_histogram}
+BuildRequires: HdrHistogram_c-devel
+%endif
BuildRequires: hicolor-icon-theme
# Java used during build
BuildRequires: java-openjdk-headless
%if 0%{?fedora}
BuildRequires: libatomic
%endif
+%if %{with system_aom}
+BuildRequires: libaom-devel >= 3.4
+%endif
BuildRequires: libbsd-devel
BuildRequires: libpng-devel
%if %{with system_tiff}
@@ -350,6 +381,9 @@
%if %{with system_nvctrl}
BuildRequires: libXNVCtrl-devel
%endif
+%if %{with system_llhttp}
+BuildRequires: llhttp-devel
+%endif
%if %{with system_llvm}
BuildRequires: llvm-devel
%endif
@@ -367,7 +401,7 @@
BuildRequires: npm
%endif
BuildRequires: pkgconfig
-BuildRequires: python3-html5lib
+BuildRequires: python3-six
BuildRequires: rsync
BuildRequires: snappy-devel
%if 0%{?suse_version}
@@ -412,9 +446,6 @@
BuildRequires: pkgconfig(absl_variant)
%endif
BuildRequires: pkgconfig(alsa)
-%if %{with system_aom}
-BuildRequires: pkgconfig(aom) >= 3.4
-%endif
BuildRequires: pkgconfig(cairo) >= 1.6
%if %{with system_dav1d}
BuildRequires: pkgconfig(dav1d) >= 1
@@ -723,7 +754,7 @@
%endif
%if %{with system_crc32c}
-find third_party/libavif -name *.[ch] -delete
+find third_party/crc32c -name *.[ch] -delete
gn_system_libraries+=( crc32c )
%endif
@@ -802,6 +833,14 @@
find third_party/electron_node/deps/nghttp2 -name *.[ch] -delete
%endif
+%if %{with system_llhttp}
+find third_party/electron_node/deps/llhttp -name *.[ch] -delete
+%endif
+
+%if %{with system_histogram}
+find third_party/electron_node/deps/histogram -name *.[ch] -delete
+%endif
+
%if %{with system_llvm}
rm -rf third_party/swiftshader/third_party/llvm-10.0
%endif
@@ -898,6 +937,12 @@
%if %{with system_nghttp2}
myconf_gn+=" use_system_nghttp2=true"
%endif
+%if %{with system_llhttp}
+myconf_gn+=" use_system_llhttp=true"
+%endif
+%if %{with system_histogram}
+myconf_gn+=" use_system_histogram=true"
+%endif
%if %{with clang}
myconf_gn+=" is_clang=true clang_base_path=\"/usr\"
clang_use_chrome_plugins=false"
myconf_gn+=" use_lld=true"
++++++ chromium-103.0.5060.53-python3-do-not-use-deprecated-mode-U.patch ++++++
diff -up chromium-103.0.5060.53/tools/grit/grit/util.py.fix-python3
chromium-103.0.5060.53/tools/grit/grit/util.py
--- chromium-103.0.5060.53/tools/grit/grit/util.py.fix-python3 2022-06-30
19:38:05.483590098 +0000
+++ chromium-103.0.5060.53/tools/grit/grit/util.py 2022-06-30
19:38:14.024304827 +0000
@@ -209,7 +209,7 @@ def ReadFile(filename, encoding):
mode = 'rb'
encoding = None
else:
- mode = 'rU'
+ mode = 'r'
with io.open(filename, mode, encoding=encoding) as f:
return f.read()
++++++ disable-catapult.patch ++++++
description: remove dependencies on third_party catapult
author: Michael Gilbert <[email protected]>
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -242,7 +242,6 @@ group("gn_all") {
deps += [
"//google_apis/gcm:mcs_probe",
"//media/cast:cast_unittests",
- "//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
]
if (!is_android) {
deps += [ "//chrome/test:telemetry_perf_unittests" ]
@@ -379,7 +378,6 @@ group("gn_all") {
"//net/android:net_junit_tests",
"//services:services_junit_tests",
"//testing/android/junit:junit_unit_tests",
- "//third_party/catapult/devil",
"//third_party/r8:custom_d8_java",
"//tools/android:android_tools",
"//tools/android:memconsumer",
@@ -1104,7 +1101,6 @@ if (!is_ios) {
"//chrome:chrome",
"//chrome/test/chromedriver",
"//testing:test_scripts_shared",
- "//third_party/catapult/third_party/typ",
]
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
@@ -1146,7 +1142,6 @@ if (!is_ios) {
"//third_party/blink/public:blink_devtools_inspector_resources",
"//third_party/blink/public/mojom:mojom_platform_js_data_deps",
"//third_party/blink/renderer/core:js_files_for_form_controls_web_tests",
- "//third_party/catapult/third_party/typ",
"//third_party/hyphenation-patterns:test_data",
"//third_party/mesa_headers",
"//tools/imagediff",
@@ -1227,7 +1222,6 @@ if (!is_ios) {
if (is_android) {
data += [
- "//third_party/catapult/",
"//build/android/",
]
}
@@ -1521,10 +1515,6 @@ if (!is_ios) {
"//third_party/blink/web_tests/StaleTestExpectations",
"//third_party/blink/web_tests/TestExpectations",
"//third_party/blink/web_tests/VirtualTestSuites",
- "//third_party/catapult/common/py_utils/",
- "//third_party/catapult/devil/",
- "//third_party/catapult/dependency_manager/",
- "//third_party/catapult/third_party/typ/",
"//third_party/depot_tools/pylint",
"//third_party/depot_tools/pylint-1.5",
"//third_party/depot_tools/pylint_main.py",
--- a/tools/binary_size/BUILD.gn
+++ b/tools/binary_size/BUILD.gn
@@ -20,7 +20,6 @@ python_library("sizes_py") {
pydeps_file = "sizes.pydeps"
data_deps = [
"//build/util:test_results",
- "//third_party/catapult/tracing:convert_chart_json",
]
}
--- a/v8/tools/BUILD.gn
+++ b/v8/tools/BUILD.gn
@@ -31,10 +31,6 @@ group("v8_android_test_runner_deps") {
if (is_android && !build_with_chromium) {
data_deps = [ "//build/android:test_runner_py" ]
- data = [
- # This is used by android.py, but not included by test_runner_py above.
- "//third_party/catapult/devil/devil/android/perf/",
- ]
}
}
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -9960,8 +9960,6 @@ if (!is_android && !is_fuchsia) {
"//chrome/test/data/password/captured_sites/",
"//chrome/test/data/web_page_replay_go_helper_scripts/automation_helper.js",
"//components/test/data/autofill/web_page_replay_support_files/",
- "//third_party/catapult/telemetry/telemetry/bin/",
- "//third_party/catapult/web_page_replay_go/deterministic.js",
]
if (is_linux || is_chromeos || is_win) {
@@ -10174,7 +10172,6 @@ if (!is_android) {
deps = [ "//tools/perf/chrome_telemetry_build:telemetry_chrome_test" ]
data = [
- "//third_party/catapult/telemetry/telemetry/internal/bin/",
"//tools/perf/run_telemetry_tests",
"//testing/scripts/run_telemetry_as_googletest.py",
]
@@ -10307,7 +10304,6 @@ if (is_mac || is_win || is_android) {
"//chrome/test/data/perf",
"//components/variations/service/generate_ui_string_overrider.py",
"//testing/scripts",
- "//third_party/catapult",
"//tools/perf",
]
data_deps = [ "//testing:test_scripts_shared" ]
--- a/tools/grit/BUILD.gn
+++ b/tools/grit/BUILD.gn
@@ -33,7 +33,6 @@ group("grit_python_unittests") {
data = [
"//testing/scripts/run_isolated_script_test.py",
"//tools/grit/",
- "//third_party/catapult/third_party/typ/",
"//third_party/node/",
"//third_party/six/src/six.py",
]
--- a/tools/metrics/BUILD.gn
+++ b/tools/metrics/BUILD.gn
@@ -45,7 +45,6 @@ group("metrics_python_tests") {
# The run_isolated_script_test.py script and its dependencies.
"//testing/scripts/run_isolated_script_test.py",
"//testing/scripts/common.py",
- "//third_party/catapult/third_party/typ/",
# Scripts we depend on. Their unit tests are also included.
"//tools/json_comment_eater/json_comment_eater.py",
--- a/tools/perf/chrome_telemetry_build/BUILD.gn
+++ b/tools/perf/chrome_telemetry_build/BUILD.gn
@@ -207,7 +207,6 @@ group("telemetry_chrome_test_without_chr
]
data_deps = [
"//testing:test_scripts_shared",
- "//third_party/catapult:telemetry_chrome_test_support",
"//tools/metrics:metrics_python_tests",
]
@@ -251,7 +250,5 @@ group("telemetry_chrome_test_without_chr
"//build/android:devil_chromium_py",
"//build/android:stack_tools",
]
- } else if (!is_fuchsia) {
- data_deps += [ "//third_party/catapult/telemetry:bitmaptools" ]
}
}
--- a/tools/polymer/BUILD.gn
+++ b/tools/polymer/BUILD.gn
@@ -8,7 +8,6 @@ group("polymer_tools_python_unittests")
data = [
"//testing/scripts/run_isolated_script_test.py",
"//tools/polymer/",
- "//third_party/catapult/third_party/typ/",
]
data_deps = [ "//testing:test_scripts_shared" ]
}
--- a/tools/gritsettings/resource_ids.spec
+++ b/tools/gritsettings/resource_ids.spec
@@ -755,12 +755,6 @@
"content/test/web_ui_mojo_test_resources.grd": {
"includes": [3860],
},
-
- # This file is generated during the build.
- "<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/tracing_resources.grd": {
- "META": {"sizes": {"includes": [20],}},
- "includes": [3880],
- },
# END content/ section.
# START ios/web/ section.
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -2530,7 +2530,6 @@ source_set("browser") {
if (!is_android) {
deps += [
"//components/vector_icons",
- "//content/browser/tracing:resources",
]
sources += [
# Non-Android platforms that don't presently support
--- a/fuchsia/engine/BUILD.gn
+++ b/fuchsia/engine/BUILD.gn
@@ -27,7 +27,6 @@ repack("web_engine_pak") {
sources = [
"$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/content/app/resources/content_resources_100_percent.pak",
- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
"$root_gen_dir/content/content_resources.pak",
"$root_gen_dir/content/dev_ui_content_resources.pak",
"$root_gen_dir/mojo/public/js/mojo_bindings_resources.pak",
@@ -42,7 +41,6 @@ repack("web_engine_pak") {
"//content:content_resources",
"//content:dev_ui_content_resources",
"//content/app/resources",
- "//content/browser/tracing:resources",
"//gpu/command_buffer/service",
"//mojo/public/js:resources",
"//net:net_resources",
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -168,7 +168,6 @@ template("chrome_extra_paks") {
"$root_gen_dir/chrome/webid_resources_100_percent.pak",
"$root_gen_dir/chrome/whats_new_resources.pak",
"$root_gen_dir/content/browser/devtools/devtools_resources.pak",
- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
]
deps += [
"//chrome/browser/resources:component_extension_resources",
@@ -198,7 +297,6 @@ template("chrome_extra_paks") {
"//chrome/browser/resources/tab_search:resources",
"//chrome/browser/resources/whats_new:resources",
"//content/browser/devtools:devtools_resources",
- "//content/browser/tracing:resources",
]
if (is_chrome_branded) {
sources += [
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -458,11 +458,6 @@ repack("pak") {
"//ui/strings",
]
- if (!is_android) {
- deps += [ "//content/browser/tracing:resources" ]
- sources += [ "$root_gen_dir/content/browser/tracing/tracing_resources.pak"
]
- }
-
if (shell_use_toolkit_views) {
deps += [ "//ui/views/resources" ]
sources +=
--- a/content/browser/tracing/BUILD.gn
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("//tools/grit/grit_rule.gni")
-import("//ui/webui/resources/tools/generate_grd.gni")
-
-assert(!is_android)
-
-# The script just writes filename with no dirs to the .grd, so we always need
-# this file to be in the same directory as the inputs.
-tracing_grd = "$target_gen_dir/tracing_resources.grd"
-
-generate_grd("build_grd") {
- grd_prefix = "tracing"
- out_grd = tracing_grd
- input_files = [
- "about_tracing.html",
- "about_tracing.js",
- ]
- input_files_base_dir = rebase_path(target_gen_dir, root_build_dir)
- deps = [ "//third_party/catapult/tracing:generate_about_tracing" ]
-}
-
-grit("resources") {
- source = tracing_grd
-
- # Required because the .grd is generated.
- enable_input_discovery_for_gn_analyze = false
-
- outputs = [
- "grit/tracing_resources.h",
- "grit/tracing_resources_map.cc",
- "grit/tracing_resources_map.h",
- "tracing_resources.pak",
- ]
-
- deps = [ ":build_grd" ]
-}
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc
@@ -25,7 +25,6 @@
#include "base/strings/string_util.h"
#include "base/trace_event/trace_event.h"
#include "base/values.h"
-#include "content/browser/tracing/grit/tracing_resources.h"
#include "content/browser/tracing/tracing_controller_impl.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
@@ -240,8 +239,6 @@ TracingUI::TracingUI(WebUI* web_ui)
web_ui->GetWebContents()->GetBrowserContext(), kChromeUITracingHost);
source->DisableTrustedTypesCSP();
source->UseStringsJs();
- source->SetDefaultResource(IDR_TRACING_ABOUT_TRACING_HTML);
- source->AddResourcePath("tracing.js", IDR_TRACING_ABOUT_TRACING_JS);
source->SetRequestFilter(base::BindRepeating(OnShouldHandleRequest),
base::BindRepeating(OnTracingRequest));
--- a/testing/BUILD.gn
+++ b/testing/BUILD.gn
@@ -45,7 +45,6 @@ group("run_perf_test") {
data_deps = [
":test_scripts_shared",
- "//third_party/catapult/tracing:convert_chart_json",
]
if (is_android) {
--- a/mojo/public/tools/BUILD.gn
+++ b/mojo/public/tools/BUILD.gn
@@ -13,6 +13,5 @@ group("mojo_python_unittests") {
deps = [ "//mojo/public/tools/mojom/mojom:tests" ]
data_deps = [
"//testing:test_scripts_shared",
- "//third_party/catapult/third_party/typ/",
]
}
--- a/third_party/webrtc/test/BUILD.gn
+++ b/third_party/webrtc/test/BUILD.gn
@@ -286,10 +286,6 @@ rtc_library("perf_test") {
]
if (rtc_enable_protobuf) {
sources += [ "testsupport/perf_test_histogram_writer.cc" ]
- deps += [
- "//third_party/catapult/tracing/tracing:histogram",
- "//third_party/catapult/tracing/tracing:reserved_infos",
- ]
} else {
sources += [ "testsupport/perf_test_histogram_writer_no_protobuf.cc" ]
}
@@ -607,7 +603,6 @@ if (rtc_include_tests && !build_with_chr
if (rtc_enable_protobuf) {
sources += [ "testsupport/perf_test_histogram_writer_unittest.cc" ]
- deps += [ "//third_party/catapult/tracing/tracing:histogram" ]
}
data = test_support_unittests_resources
--- a/tools/perf/core/perfetto_binary_roller/BUILD.gn
+++ b/tools/perf/core/perfetto_binary_roller/BUILD.gn
@@ -7,7 +7,6 @@ import("//build/util/generate_wrapper.gn
generate_wrapper("upload_trace_processor") {
testonly = true
data_deps = [
- "//third_party/catapult:telemetry_chrome_test_support",
"//third_party/perfetto/src/trace_processor:trace_processor_shell",
]
data = [
--- a/weblayer/shell/BUILD.gn
+++ b/weblayer/shell/BUILD.gn
@@ -185,9 +185,6 @@ repack("support_pak") {
}
if (is_android) {
deps += [ "//ui/android:ui_java_resources" ]
- } else {
- deps += [ "//content/browser/tracing:resources" ]
- sources += [ "$root_gen_dir/content/browser/tracing/tracing_resources.pak"
]
}
output = "$root_out_dir/weblayer_support.pak"
}
--- a/electron/electron_paks.gni
+++ b/electron/electron_paks.gni
@@ -57,7 +57,6 @@
"$root_gen_dir/chrome/dev_ui_browser_resources.pak",
"$root_gen_dir/components/components_resources.pak",
"$root_gen_dir/content/browser/resources/media/media_internals_resources.pak",
- "$root_gen_dir/content/browser/tracing/tracing_resources.pak",
"$root_gen_dir/content/browser/webrtc/resources/webrtc_internals_resources.pak",
"$root_gen_dir/content/content_resources.pak",
"$root_gen_dir/content/dev_ui_content_resources.pak",
@@ -73,7 +72,6 @@
"//content:content_resources",
"//content:dev_ui_content_resources",
"//content/browser/resources/media:resources",
- "//content/browser/tracing:resources",
"//content/browser/webrtc/resources",
"//electron:resources",
"//mojo/public/js:resources",
++++++ electron-19.0.7.tar.xz -> electron-19.0.8.tar.xz ++++++
/work/SRC/openSUSE:Factory/nodejs-electron/electron-19.0.7.tar.xz
/work/SRC/openSUSE:Factory/.nodejs-electron.new.1523/electron-19.0.8.tar.xz
differ: char 15, line 1
++++++ node-system-libs.patch ++++++
--- /var/tmp/diff_new_pack.ejujLi/_old 2022-07-07 12:58:31.231426341 +0200
+++ /var/tmp/diff_new_pack.ejujLi/_new 2022-07-07 12:58:31.231426341 +0200
@@ -1,12 +1,14 @@
--- a/third_party/electron_node/BUILD.gn 2022-06-15 16:17:43.423991754
+0200
+++ b/third_party/electron_node/BUILD.gn 2022-06-20 16:24:07.832340077
+0200
-@@ -40,6 +40,23 @@
+@@ -40,6 +40,25 @@
# Allows embedders to override the NODE_MODULE_VERSION define
node_module_version = ""
+
+ use_system_cares = false
+ use_system_nghttp2 = false
++ use_system_llhttp = false
++ use_system_histogram = false
+}
+
+if (is_linux) {
@@ -24,14 +26,14 @@
}
assert(!node_use_dtrace, "node_use_dtrace not supported in GN")
-@@ -182,17 +199,25 @@
+@@ -182,17 +201,23 @@
component("node_lib") {
deps = [
":node_js2c",
- "deps/cares",
- "deps/histogram",
+- "deps/histogram",
"deps/googletest:gtest",
- "deps/llhttp",
+- "deps/llhttp",
- "deps/nghttp2",
"deps/uvwasi",
"//third_party/zlib",
@@ -52,4 +54,22 @@
public_deps = [
"deps/uv",
"//electron:electron_js2c",
+@@ -202,6 +227,17 @@
+ public_configs = [ ":node_lib_config" ]
+ include_dirs = [ "src" ]
+ 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 = []
+ cflags_cc = [
+ "-Wno-deprecated-declarations",
