Skip to content

Commit

Permalink
Upgrade more dependencies to their latest version.
Browse files Browse the repository at this point in the history
  • Loading branch information
saurik committed Nov 17, 2024
1 parent acc996c commit f9f5577
Show file tree
Hide file tree
Showing 22 changed files with 35 additions and 22 deletions.
5 changes: 4 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
url = https://chromium.googlesource.com/chromium/src/base/trace_event/common.git
[submodule "protobuf"]
path = lib-protocol/protobuf
url = https://chromium.googlesource.com/external/github.com/google/protobuf
url = https://github.com/protocolbuffers/protobuf.git
[submodule "jinja2"]
path = min-v8/jinja2
url = https://chromium.googlesource.com/chromium/src/third_party/jinja2.git
Expand Down Expand Up @@ -259,3 +259,6 @@
[submodule "simdutf"]
path = srv-worker/simdutf
url = https://github.com/simdutf/simdutf.git
[submodule "fast_float"]
path = min-v8/fast_float
url = https://github.com/fastfloat/fast_float.git
2 changes: 1 addition & 1 deletion env/output.mk
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ $(output)/%.cc.o: $$(specific) $$(folder).cc $$(code)
$(specific)
@mkdir -p $(dir $@)
@echo [CC] $(target)/$(arch) $<
$(call compile,cxx,c++,-std=c++17)
$(call compile,cxx,c++,-std=c++20)

$(output)/%.c++.o: $$(specific) $$(folder).c++ $$(code)
$(specific)
Expand Down
2 changes: 1 addition & 1 deletion lib-protocol/c-ares
5 changes: 4 additions & 1 deletion lib-protocol/protobuf.mk
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protoc := $(output)/protoc

$(output)/protobuf/%.o: $(pwd/protobuf)/src/google/protobuf/%.cc
@mkdir -p $(dir $@)
clang++ -stdlib=libc++ -c -std=c++11 -o $@ -DHAVE_PTHREAD -I$(pwd/protobuf)/src -Isrc $<
clang++ -stdlib=libc++ -c -std=c++20 -o $@ -DHAVE_PTHREAD -I$(pwd/protobuf)/src -Isrc $<

$(protoc): $(patsubst $(pwd/protobuf)/src/google/protobuf/%.cc,$(output)/protobuf/%.o,$(shell echo $(pwd/protobuf)/src/google/protobuf/{,compiler/{,cpp/,csharp/,java/,js/,objectivec/,php/,python/,ruby/},io/,stubs/}!(*test*|*mock*).cc))
@mkdir -p $(dir $@)
Expand All @@ -46,3 +46,6 @@ $(foreach ext,cc h,$$(output)/pb$(1)/%.pb.$(ext)): $(2)/%.proto $$(protoc)
pflags += -I$(2)
cflags += -I$(output)/pb$(1)
endef

# XXX: this is only because I'm using an old protobuf
cflags/$(pwd/protobuf)/ += -Wno-deprecated-pragma
2 changes: 1 addition & 1 deletion min-boringssl/boringssl
Submodule boringssl updated from 76968b to 83fc0d
2 changes: 1 addition & 1 deletion min-icu4c/icu
Submodule icu updated 68 files
+33 −0 KEYS
+1 −0 icu4c/source/common/ucurr.cpp
+0 −1 icu4c/source/common/unicode/urename.h
+5 −9 icu4c/source/data/brkitr/rules/char.txt
+3 −0 icu4c/source/test/cintltst/currtest.c
+2 −22 icu4c/source/test/intltest/loctest.cpp
+20 −21 icu4c/source/test/intltest/rbbitst.cpp
+7 −9 icu4c/source/test/testdata/break_rules/grapheme.txt
+3 −12 icu4c/source/test/testdata/rbbitst.txt
+12 −0 icu4c/source/test/testdata/structLocale.txt
+1 −1 icu4j/demos/pom.xml
+2 −1 icu4j/main/charset/pom.xml
+1 −1 icu4j/main/collate/pom.xml
+1 −1 icu4j/main/common_tests/pom.xml
+11 −15 icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java
+1 −1 icu4j/main/core/pom.xml
+ icu4j/main/core/src/main/resources/com/ibm/icu/impl/data/icudata/brkitr/char.brk
+1 −16 icu4j/main/core/src/test/java/com/ibm/icu/dev/test/message2/TestUtils.java
+15 −16 icu4j/main/core/src/test/java/com/ibm/icu/dev/test/rbbi/RBBITestMonkey.java
+43 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/README.txt
+18 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/alias-selector-annotations.json
+43 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/duplicate-declarations.json
+57 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/icu-parser-tests.json
+221 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/icu-test-functions.json
+139 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/icu-test-previous-release.json
+372 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/icu-test-selectors.json
+25 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/invalid-number-literals-diagnostics.json
+47 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/invalid-options.json
+15 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/markup.json
+34 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/matches-whitespace.json
+177 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/more-data-model-errors.json
+117 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/more-functions.json
+67 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/normalization.json
+14 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/resolution-errors.json
+27 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/runtime-errors.json
+185 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/data-model-errors.json
+46 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/functions/date.json
+68 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/functions/datetime.json
+32 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/functions/integer.json
+407 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/functions/number.json
+51 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/functions/string.json
+43 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/functions/time.json
+180 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/syntax-errors.json
+699 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/spec/syntax.json
+50 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/syntax-errors-diagnostics-multiline.json
+347 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/syntax-errors-diagnostics.json
+29 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/syntax-errors-end-of-input.json
+22 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/syntax-errors-reserved.json
+19 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/tricky-declarations.json
+77 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/unsupported-expressions.json
+27 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/unsupported-statements.json
+156 −0 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/message2/valid-tests.json
+7 −9 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/rbbi/break_rules/grapheme.txt
+3 −12 icu4j/main/core/src/test/resources/com/ibm/icu/dev/test/rbbi/rbbitst.txt
+1 −1 icu4j/main/currdata/pom.xml
+1 −1 icu4j/main/framework/pom.xml
+2 −1 icu4j/main/icu4j/pom.xml
+1 −1 icu4j/main/langdata/pom.xml
+2 −1 icu4j/main/localespi/pom.xml
+1 −1 icu4j/main/regiondata/pom.xml
+1 −1 icu4j/main/translit/pom.xml
+1 −1 icu4j/perf-tests/pom.xml
+4 −1 icu4j/pom.xml
+2 −2 icu4j/releases_tools/shared.sh
+1 −1 icu4j/samples/pom.xml
+1 −1 icu4j/tools/build/pom.xml
+1 −1 icu4j/tools/misc/pom.xml
+1 −1 tools/cldr/cldr-to-icu/pom.xml
2 changes: 1 addition & 1 deletion min-jinja2cpp/expected-lite
2 changes: 1 addition & 1 deletion min-pcre2/pcre2
Submodule pcre2 updated from 82ebeb to 3284cc
1 change: 1 addition & 0 deletions min-v8/extra/third_party/fast_float/src
1 change: 1 addition & 0 deletions min-v8/fast_float
Submodule fast_float added at e800ca
12 changes: 8 additions & 4 deletions min-v8/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ v8all := $(patsubst ./%,$(pwd/v8)/src/%,$(shell cd $(pwd/v8)/src && find . \
-path "./third_party" -prune -o \
-path "./tracing" -prune -o \
-path "./wasm/fuzzing" -prune -o \
-path "./wasm/interpreter" -prune -o \
\
! -path "./builtins/generate-bytecodes-builtins-list.cc" \
! -path "./regexp/gen-regexp-special-case.cc" \
Expand Down Expand Up @@ -73,6 +74,7 @@ v8src := $(filter-out \
%_win.cc \
%-win.cc \
%-win64.cc \
%_zos.cc \
,$(v8all))

# XXX: this is a mess that I need to clean up
Expand Down Expand Up @@ -145,7 +147,7 @@ vflags += -DV8_WIN64_UNWINDING_INFO

ifeq ($(bits/$(machine)),64)
#vflags += -DV8_COMPRESS_POINTERS
#vflags += -DV8_COMPRESS_POINTERS_IN_ISOLATE_CAGE
#vflags += -DV8_COMPRESS_POINTERS_IN_MULTIPLE_CAGES
#vflags += -DV8_SHORT_BUILTIN_CALLS
endif

Expand Down Expand Up @@ -184,7 +186,7 @@ vflags += -include cstdint

$(output)/$(pwd/v8)/gen-regexp-special-case: $(pwd)/v8/src/regexp/gen-regexp-special-case.cc $(pwd)/fatal.cc $(output)/icu4c/lib/libicuuc.a $(output)/icu4c/lib/libicudata.a
@mkdir -p $(dir $@)
clang++ -std=c++17 -pthread -o $@ $^ $(vflags) $(icu4c) -ldl -m$(bits/$(machine))
clang++ -std=c++20 -pthread -o $@ $^ $(vflags) $(icu4c) -ldl -m$(bits/$(machine))

$(output)/$(pwd/v8)/special-case.cc: $(output)/$(pwd/v8)/gen-regexp-special-case
@mkdir -p $(dir $@)
Expand All @@ -197,7 +199,7 @@ source += $(output)/$(pwd/v8)/special-case.cc

$(output)/$(pwd/v8)/generate-bytecodes-builtins-list: $(pwd)/v8/src/builtins/generate-bytecodes-builtins-list.cc $(pwd)/v8/src/interpreter/bytecodes.cc $(pwd)/v8/src/interpreter/bytecode-operands.cc $(pwd)/fatal.cc
@mkdir -p $(dir $@)
clang++ -std=c++17 -pthread -o $@ $^ $(vflags) -m$(bits/$(machine))
clang++ -std=c++20 -pthread -o $@ $^ $(vflags) -m$(bits/$(machine))

$(output)/$(pwd/v8)/builtins-generated/bytecodes-builtins-list.h: $(output)/$(pwd/v8)/generate-bytecodes-builtins-list
@mkdir -p $(dir $@)
Expand All @@ -216,7 +218,7 @@ torque := $(patsubst ./%,%,$(sort $(shell cd $(pwd)/v8 && find . -name '*.tq')))
$(output)/$(pwd/v8)/torque: $(wildcard $(pwd)/v8/src/torque/*.cc) $(pwd)/fatal.cc
@rm -rf $(dir $@)
@mkdir -p $(dir $@)
clang++ -std=c++17 -pthread -o $@ $^ $(vflags) -m$(bits/$(machine))
clang++ -std=c++20 -pthread -o $@ $^ $(vflags) -m$(bits/$(machine))

tqsrc := $(patsubst %.tq,%-tq-csa.cc,$(torque))
tqsrc += class-debug-readers.cc
Expand Down Expand Up @@ -276,6 +278,8 @@ cflags/$(pwd/v8)/ += -Wno-builtin-assume-aligned-alignment
# XXX: they might have already changed many of these cases
cflags/$(pwd/v8)/ += -Wno-unused-but-set-variable

cflags/$(pwd/v8)/ += -Wno-unneeded-internal-declaration

cflags += -Wno-invalid-offsetof

archive += $(pwd/v8)/
2 changes: 1 addition & 1 deletion min-v8/v8
Submodule v8 updated from 6e6fa8 to 177b98
2 changes: 1 addition & 1 deletion min-webrtc/webrtc
Submodule webrtc updated from 849549 to 9ab2ac
2 changes: 1 addition & 1 deletion min-zlib/libz
Submodule libz updated from c7678b to 7e2e4d
1 change: 1 addition & 0 deletions modules
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ head[min-v8/v8]=$(sed -e '/url = "https:\/\/github.com\/v8\/v8\//!d;s/^.*\///;s/
# XXX: https://github.com/jinja2cpp/Jinja2Cpp/issues/257
# llvm-project (libcxx/libcxxabi) is stuck due to me being bored of this
# openvpn3 is stuck due to external transport factory breaking OPENVPN_LOG
# protobuf is stuck due to their build system being extremely annoying :/

git submodule foreach -q 'echo $displaypath' | while read -r sub; do (
cd "${sub}"
Expand Down
2 changes: 1 addition & 1 deletion srv-worker/workerd
Submodule workerd updated 160 files
2 changes: 1 addition & 1 deletion vpn-shared/libssh
Submodule libssh updated from 861590 to d2e5b6

0 comments on commit f9f5577

Please sign in to comment.