Skip to content

Commit cd19746

Browse files
committed
build,deps,src: bring back v8 abseil-cpp
Make sure v8 is built with its own abseil-cpp version while the other dependencies use the one from protobuffer. The actual fix was avoid using the same name for the abseil target as it doesn't work on Windows. PR-URL: #349 Reviewed-By: Rafael Gonzaga <rafael.nunu@hotmail.com>
1 parent 7cd0229 commit cd19746

9 files changed

Lines changed: 23 additions & 19 deletions

File tree

agents/grpc/src/grpc_agent.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "asserts-cpp/asserts.h"
44
#include "debug_utils-inl.h"
55
#include "nsolid/nsolid_api.h"
6+
#include "nsolid/continuous_profiler.h"
67
#include "nsolid/nsolid_util.h"
78
#include "../../otlp/src/otlp_common.h"
89
#include "../../src/root_certs.h"

deps/grpc/grpc.gyp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
'CARES_STATICLIB',
8282
],
8383
'dependencies': [
84-
'../protobuf/abseil.gyp:abseil',
84+
'../protobuf/abseil.gyp:abseil_proto',
8585
'address_sorting',
8686
'upb',
8787
're2',
@@ -695,6 +695,7 @@
695695
'src/core/lib/promise/activity.cc',
696696
'src/core/lib/promise/party.cc',
697697
'src/core/lib/promise/sleep.cc',
698+
'src/core/lib/promise/wait_set.cc',
698699
'src/core/lib/resource_quota/api.cc',
699700
'src/core/lib/resource_quota/arena.cc',
700701
'src/core/lib/resource_quota/connection_quota.cc',
@@ -994,7 +995,7 @@
994995
'dependencies': [
995996
'grpc',
996997
'upb',
997-
'../protobuf/abseil.gyp:abseil',
998+
'../protobuf/abseil.gyp:abseil_proto',
998999
'../protobuf/utf8_range.gyp:utf8_range',
9991000
'../openssl/openssl.gyp:openssl',
10001001
],
@@ -1072,7 +1073,7 @@
10721073
],
10731074
'dependencies': [
10741075
'../protobuf/protobuf.gyp:protobuf',
1075-
'../protobuf/abseil.gyp:abseil',
1076+
'../protobuf/abseil.gyp:abseil_proto',
10761077
],
10771078
'include_dirs': [
10781079
'./',

deps/opentelemetry-cpp/otlp-http-exporter.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
'../protobuf/protobuf.gyp:protobuf',
6969
'../curl/curl.gyp:curl',
7070
'../grpc/grpc.gyp:grpc++',
71-
'../protobuf/abseil.gyp:abseil',
71+
'../protobuf/abseil.gyp:abseil_proto',
7272
'../zlib/zlib.gyp:zlib',
7373
],
7474
'direct_dependent_settings': {

deps/protobuf/abseil.gyp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
'targets': [
33
{
4-
'target_name': 'abseil',
4+
'target_name': 'abseil_proto',
55
'type': 'static_library',
66
'variables': {
77
'ABSEIL_ROOT': 'third_party/abseil-cpp',
@@ -177,4 +177,4 @@
177177
],
178178
},
179179
]
180-
}
180+
}

deps/protobuf/protobuf.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
'HAVE_PTHREAD'
88
],
99
'dependencies': [
10-
'./abseil.gyp:abseil',
10+
'./abseil.gyp:abseil_proto',
1111
],
1212
'cflags_cc': [
1313
'-Wall',

deps/protobuf/utf8_range.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
'target_name': 'utf8_range',
55
'type': 'static_library',
66
'dependencies': [
7-
'./abseil.gyp:abseil',
7+
'./abseil.gyp:abseil_proto',
88
],
99
'direct_dependent_settings': {
1010
'include_dirs': [

node.gyp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -977,7 +977,8 @@
977977
'deps/googletest/googletest.gyp:gtest_prod',
978978
'deps/histogram/histogram.gyp:histogram',
979979
'deps/nbytes/nbytes.gyp:nbytes',
980-
'deps/protobuf/abseil.gyp:abseil',
980+
'deps/protobuf/abseil.gyp:abseil_proto',
981+
'tools/v8_gypfiles/abseil.gyp:abseil',
981982
'node_js2c#host',
982983
],
983984

@@ -1316,7 +1317,8 @@
13161317
'deps/googletest/googletest.gyp:gtest_main',
13171318
'deps/histogram/histogram.gyp:histogram',
13181319
'deps/nbytes/nbytes.gyp:nbytes',
1319-
'deps/protobuf/abseil.gyp:abseil',
1320+
'deps/protobuf/abseil.gyp:abseil_proto',
1321+
'tools/v8_gypfiles/abseil.gyp:abseil',
13201322
],
13211323

13221324
'includes': [

src/nsolid/nsolid_api.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "node_snapshotable.h"
1919
#include "nsolid.h"
2020
#include "nsuv-inl.h"
21-
#include "continuous_profiler.h"
2221
#include "nsolid_heap_snapshot.h"
2322
#include "nsolid_trace.h"
2423
#include "nsolid_util.h"

tools/v8_gypfiles/v8.gyp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
'v8_base_without_compiler',
262262
'v8_initializers',
263263
'v8_maybe_icu',
264-
'../../deps/protobuf/abseil.gyp:abseil',
264+
'abseil.gyp:abseil',
265265
],
266266
'sources': [
267267
'<(V8_ROOT)/src/init/setup-isolate-full.cc',
@@ -277,7 +277,7 @@
277277
'dependencies': [
278278
'generate_bytecode_builtins_list',
279279
'run_torque',
280-
'../../deps/protobuf/abseil.gyp:abseil',
280+
'abseil.gyp:abseil',
281281
],
282282
'cflags!': ['-O3'],
283283
'cflags': ['-O1'],
@@ -305,7 +305,7 @@
305305
'v8_base_without_compiler',
306306
'v8_shared_internal_headers',
307307
'v8_pch',
308-
'../../deps/protobuf/abseil.gyp:abseil',
308+
'abseil.gyp:abseil',
309309
],
310310
'include_dirs': [
311311
'<(SHARED_INTERMEDIATE_DIR)',
@@ -495,6 +495,7 @@
495495
'v8_compiler_for_mksnapshot',
496496
'v8_initializers',
497497
'v8_libplatform',
498+
'abseil.gyp:abseil',
498499
]
499500
}],
500501
['OS=="win" and clang==1', {
@@ -609,7 +610,7 @@
609610
'run_torque',
610611
'v8_libbase',
611612
'fp16',
612-
'../../deps/protobuf/abseil.gyp:abseil',
613+
'abseil.gyp:abseil',
613614
],
614615
'direct_dependent_settings': {
615616
'sources': [
@@ -938,7 +939,7 @@
938939
'v8_shared_internal_headers',
939940
'v8_turboshaft',
940941
'v8_pch',
941-
'../../deps/protobuf/abseil.gyp:abseil',
942+
'abseil.gyp:abseil',
942943
],
943944
'conditions': [
944945
['v8_enable_turbofan==1', {
@@ -961,7 +962,7 @@
961962
'v8_libbase',
962963
'v8_shared_internal_headers',
963964
'v8_pch',
964-
'../../deps/protobuf/abseil.gyp:abseil',
965+
'abseil.gyp:abseil',
965966
],
966967
'sources': [
967968
'<!@pymod_do_main(GN-scraper "<(V8_ROOT)/BUILD.gn" "v8_source_set.\\"v8_turboshaft.*?sources = ")',
@@ -1082,7 +1083,7 @@
10821083
'v8_zlib',
10831084
'v8_pch',
10841085
'fp16',
1085-
'../../deps/protobuf/abseil.gyp:abseil',
1086+
'abseil.gyp:abseil',
10861087
],
10871088
'includes': ['inspector.gypi'],
10881089
'direct_dependent_settings': {
@@ -1802,7 +1803,7 @@
18021803
'v8_maybe_icu',
18031804
'v8_turboshaft',
18041805
'v8_pch',
1805-
'../../deps/protobuf/abseil.gyp:abseil',
1806+
'abseil.gyp:abseil',
18061807
# "build/win:default_exe_manifest",
18071808
],
18081809
'sources': [

0 commit comments

Comments
 (0)