Skip to content

Commit ec495a1

Browse files
authored
Update to latest boringssl chromium-stable commit (java-native-access#570)
Motivation: There were updates to the chromium-stable branch of boringssl. Modifications: Update to latest sha Result: Use more recent boringssl version
1 parent 487fcb2 commit ec495a1

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

codec-native-quic/pom.xml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<boringsslRepository>https://boringssl.googlesource.com/boringssl</boringsslRepository>
4848
<!-- Lets use what we use in netty-tcnative-boringssl-static -->
4949
<boringsslBranch>chromium-stable</boringsslBranch>
50-
<boringsslCommitSha>ca1690e221677cea3fb946f324eb89d846ec53f2</boringsslCommitSha>
50+
<boringsslCommitSha>dd5219451c3ce26221762a15d867edf43b463bb2</boringsslCommitSha>
5151

5252
<quicheSourceDir>${project.build.directory}/quiche-source</quicheSourceDir>
5353
<quicheBuildDir>${quicheSourceDir}/target/release</quicheBuildDir>
@@ -116,9 +116,9 @@
116116
<!-- On *nix, add ASM flags to disable executable stack -->
117117
<cmakeAsmFlags>-Wa,--noexecstack -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
118118
<extraCflags>-mmacosx-version-min=${macosxDeploymentTarget}</extraCflags>
119-
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags>
119+
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags>
120120
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
121-
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags>
121+
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags>
122122
<libssl>libssl.a</libssl>
123123
<libcrypto>libcrypto.a</libcrypto>
124124
<libquiche>libquiche.a</libquiche>
@@ -139,9 +139,9 @@
139139
<!-- On *nix, add ASM flags to disable executable stack -->
140140
<cmakeAsmFlags>-Wa,--noexecstack -target arm64-apple-macos11</cmakeAsmFlags>
141141
<extraCmakeFlags>-DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64</extraCmakeFlags>
142-
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags>
142+
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags>
143143
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
144-
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags>
144+
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags>
145145
<libssl>libssl.a</libssl>
146146
<libcrypto>libcrypto.a</libcrypto>
147147
<libquiche>libquiche.a</libquiche>
@@ -169,9 +169,9 @@
169169
<!-- On *nix, add ASM flags to disable executable stack -->
170170
<cmakeAsmFlags>-Wa,--noexecstack -target x86_64-apple-macos10.12 -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
171171
<extraCmakeFlags>-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64</extraCmakeFlags>
172-
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags>
172+
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags>
173173
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
174-
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags>
174+
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags>
175175
<libssl>libssl.a</libssl>
176176
<libcrypto>libcrypto.a</libcrypto>
177177
<libquiche>libquiche.a</libquiche>
@@ -202,9 +202,9 @@
202202
<extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
203203
<!-- On *nix, add ASM flags to disable executable stack -->
204204
<cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
205-
<cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags>
205+
<cmakeCFlags>${extraCflags}</cmakeCFlags>
206206
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
207-
<cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
207+
<cmakeCxxFlags>${extraCxxflags} -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
208208
<libssl>libssl.a</libssl>
209209
<libcrypto>libcrypto.a</libcrypto>
210210
<libquiche>libquiche.a</libquiche>
@@ -278,9 +278,9 @@
278278
<extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
279279
<!-- On *nix, add ASM flags to disable executable stack -->
280280
<cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
281-
<cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags>
281+
<cmakeCFlags>${extraCflags}</cmakeCFlags>
282282
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
283-
<cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
283+
<cmakeCxxFlags>${extraCxxflags} -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
284284
<libssl>libssl.a</libssl>
285285
<libcrypto>libcrypto.a</libcrypto>
286286
<libquiche>libquiche.a</libquiche>
@@ -461,9 +461,9 @@
461461
<extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
462462
<!-- On *nix, add ASM flags to disable executable stack -->
463463
<cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
464-
<cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags>
464+
<cmakeCFlags>${extraCflags}</cmakeCFlags>
465465
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
466-
<cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
466+
<cmakeCxxFlags>${extraCxxflags} -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
467467
<libssl>libssl.a</libssl>
468468
<libcrypto>libcrypto.a</libcrypto>
469469
<libquiche>libquiche.a</libquiche>

0 commit comments

Comments
 (0)