Skip to content

Protobuf 22.5 cpp #11961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kannanjgithub merged 63 commits into from
May 23, 2025
Merged

Protobuf 22.5 cpp #11961

Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
6d68cb5
Upgrade Protobuf C++ to 22.5
ejona86 Mar 12, 2025
284234c
Re-add downloading of absl
ejona86 Mar 13, 2025
b76908f
Set LIBRARY_PATH to /tmp/protobuf/lib
kannanjgithub Mar 13, 2025
76a613a
Remove LD_LIBRARY_PATH to try fix "found unexpected dependencies" in …
kannanjgithub Mar 13, 2025
707a50a
Add librt.so.1 to needed dependencies.
kannanjgithub Mar 17, 2025
9485113
Add libm.so.6 as an expected dependency for linux.
kannanjgithub Mar 17, 2025
5a3e3cc
Replace parallel compilation option -j with env variable for the purp…
kannanjgithub Mar 17, 2025
8d8e03c
On multiarch arch64, it requires cmake 3.13 to allow using abseil mod…
kannanjgithub Mar 17, 2025
a5ec1ae
Fix mistake in current directory used.
kannanjgithub Mar 17, 2025
54c962a
Fix missing software deps
kannanjgithub Mar 19, 2025
097c01a
Windows changes.
kannanjgithub Apr 30, 2025
df959ea
missed this file in the commit
kannanjgithub Apr 30, 2025
6ea8908
Use openjdk 21
kannanjgithub Apr 30, 2025
17a479b
Hardcode the location of vcvars64.bat because vswhere doesn't show th…
kannanjgithub May 2, 2025
4177f3e
use VC 2022 install path directly in windows32.bat since vswhere does…
kannanjgithub May 2, 2025
612ba86
Changing it back to using VS170COMNTOOLS
kannanjgithub May 2, 2025
c19d0a5
Add powershell command = 'SilentlyContinue' because apparently proto…
kannanjgithub May 2, 2025
731a8ed
Add powershell command = 'SilentlyContinue' because apparently proto…
kannanjgithub May 2, 2025
a8da589
Add ABSL_INTERNAL_AT_LEAST_CXX17=0 for the 64 bit archs too
kannanjgithub May 2, 2025
767c072
Re-do lines deleted by mistake (introduced in commit 8d8e03c291f97965…
kannanjgithub May 2, 2025
17a811c
Revert last commit, fails to build cmake with OPENSSL errors, with 3.…
kannanjgithub May 2, 2025
e6f445b
Use openjdk 11.
kannanjgithub May 5, 2025
3b97cc8
Remove Ctrl M characters, use gcc option to specify c++ 14
kannanjgithub May 5, 2025
a2fd8dc
Fix open jdk version to 11.0 as 11.0.27 is not available.
kannanjgithub May 5, 2025
5b96e1e
Fix jdk version
kannanjgithub May 5, 2025
8c35eed
Remove accidental commenting out.
kannanjgithub May 5, 2025
f91dbc7
Missed libs
kannanjgithub May 5, 2025
19d0917
Remove leading whitespace in libraries list
kannanjgithub May 5, 2025
4d3f252
Fix libs leading space
kannanjgithub May 5, 2025
02788d8
Don't put spaces in between libs since it breaks the env variable va…
kannanjgithub May 6, 2025
f6fa6f0
Download cmake for android
kannanjgithub May 6, 2025
c3bdce7
Change from /var/local to /usr/local to download cmake as the path is…
kannanjgithub May 6, 2025
927fca6
Fix forgotten % instead of ! for local scope variable.
kannanjgithub May 6, 2025
8d5afa1
Can't write to /usr/local either, use /tmp to install cmake for android.
kannanjgithub May 6, 2025
bc57b03
Install pkg-config for android
kannanjgithub May 6, 2025
75c2a7d
Fix x32 VS generator
kannanjgithub May 6, 2025
1369473
apt-get update before install pkg-config.
kannanjgithub May 6, 2025
260fccf
Fix mistake in order of statements reg. pkg-config
kannanjgithub May 6, 2025
4ef7fd1
Fix mistaken use of x32 instead of x86
kannanjgithub May 6, 2025
088b489
Fix typo
kannanjgithub May 6, 2025
f4aeb67
Skip codegen when rebuilding HEAD.
kannanjgithub May 7, 2025
09535d8
Remove syntax error in assignment
kannanjgithub May 7, 2025
2435780
Remove syntax error in assignment
kannanjgithub May 7, 2025
88999f8
Windows geneator flag for x86
kannanjgithub May 7, 2025
8e16a15
Install pkg-config on mac
kannanjgithub May 7, 2025
4f7c9bb
Change apt-get to brew for mac os for installing pkg-config
kannanjgithub May 7, 2025
3c8bc90
Remove installing pkg-config, its alreay there.
kannanjgithub May 7, 2025
415e913
Try LD_LIBRARY_PATH as well, for mac since I'm getting linker errors …
kannanjgithub May 7, 2025
e529cf1
Skip failing socket options test for windows
kannanjgithub May 9, 2025
5280d65
Add patch for absl time CMakeLists
kannanjgithub May 9, 2025
9f3f4de
KERNEL32.dll position has moved in deps dump output, and avoid patchi…
kannanjgithub May 12, 2025
f2677ce
Try adding CoreFoundation framework linker args to grpc-compiler as w…
kannanjgithub May 12, 2025
3ecdf56
Fix dll extraction logic in checkArtifacts
kannanjgithub May 13, 2025
fcbb3b4
Increase timeout since build timed out after doing x86 but while doin…
kannanjgithub May 14, 2025
dc5e644
Remove patching absl time linker args for CoreFoundation since it onl…
kannanjgithub May 14, 2025
2c5c636
Remove dependencies not needed, and change the logic for checkArtifacts
kannanjgithub May 15, 2025
2cec6d2
Convert tabs to spaces and unix2dos
kannanjgithub May 15, 2025
b604fd0
Unix2dos
kannanjgithub May 15, 2025
092efe4
Minor changes
kannanjgithub May 15, 2025
9072cae
dos2unix
kannanjgithub May 15, 2025
2d025dd
Re-introduce installing apache maven because of facing java.lang.Unsu…
kannanjgithub May 15, 2025
76276a4
Unsupported class version error was unrelated and not the cause of th…
kannanjgithub May 15, 2025
c0b53db
Remove setting JAVA_HOME.
kannanjgithub May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove setting JAVA_HOME.
  • Loading branch information
@kannanjgithub
kannanjgithub committed May 22, 2025
commit c0b53db9a05baad437b55447451c5d5f66667aaa
1 change: 0 additions & 1 deletion buildscripts/make_dependencies.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
choco install -y pkgconfiglite
choco install -y openjdk --version=17.0
set JAVA_HOME="c:\Program Files\OpenJDK\jdk-17"
set PATH=%PATH%;"c:\Program Files\OpenJDK\jdk-17\bin"
set PROTOBUF_VER=22.5
set ABSL_VERSION=20230125.4
Expand Down