Skip to content
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

Jump to bottom

Update to latest boringssl chromium-stable commit #570

Merged
merged 2 commits into from
Sep 5, 2023
Merged

Update to latest boringssl chromium-stable commit #570

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08a3ee7
Update to latest boringssl chromium-stable commit
normanmaurer Aug 23, 2023
63e91c9
Remove -DOPENSSL_C11_ATOMIC
normanmaurer Sep 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 13 additions & 13 deletions codec-native-quic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<boringsslRepository>https://boringssl.googlesource.com/boringssl</boringsslRepository>
<!-- Lets use what we use in netty-tcnative-boringssl-static -->
<boringsslBranch>chromium-stable</boringsslBranch>
<boringsslCommitSha>ca1690e221677cea3fb946f324eb89d846ec53f2</boringsslCommitSha>
<boringsslCommitSha>dd5219451c3ce26221762a15d867edf43b463bb2</boringsslCommitSha>

<quicheSourceDir>${project.build.directory}/quiche-source</quicheSourceDir>
<quicheBuildDir>${quicheSourceDir}/target/release</quicheBuildDir>
Expand Down Expand Up @@ -116,9 +116,9 @@
<!-- On *nix, add ASM flags to disable executable stack -->
<cmakeAsmFlags>-Wa,--noexecstack -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
<extraCflags>-mmacosx-version-min=${macosxDeploymentTarget}</extraCflags>
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags>
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags>
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags>
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags>
<libssl>libssl.a</libssl>
<libcrypto>libcrypto.a</libcrypto>
<libquiche>libquiche.a</libquiche>
Expand All @@ -139,9 +139,9 @@
<!-- On *nix, add ASM flags to disable executable stack -->
<cmakeAsmFlags>-Wa,--noexecstack -target arm64-apple-macos11</cmakeAsmFlags>
<extraCmakeFlags>-DCMAKE_SYSTEM_PROCESSOR=arm64 -DCMAKE_OSX_ARCHITECTURES=arm64</extraCmakeFlags>
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags>
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags>
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags>
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags>
<libssl>libssl.a</libssl>
<libcrypto>libcrypto.a</libcrypto>
<libquiche>libquiche.a</libquiche>
Expand Down Expand Up @@ -169,9 +169,9 @@
<!-- On *nix, add ASM flags to disable executable stack -->
<cmakeAsmFlags>-Wa,--noexecstack -target x86_64-apple-macos10.12 -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
<extraCmakeFlags>-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64</extraCmakeFlags>
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC</cmakeCFlags>
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags>
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -DOPENSSL_C11_ATOMIC -Wno-error=range-loop-analysis</cmakeCxxFlags>
<cmakeCxxFlags>${extraCxxflags} -O3 -fno-omit-frame-pointer -Wno-error=range-loop-analysis</cmakeCxxFlags>
<libssl>libssl.a</libssl>
<libcrypto>libcrypto.a</libcrypto>
<libquiche>libquiche.a</libquiche>
Expand Down Expand Up @@ -202,9 +202,9 @@
<extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
<!-- On *nix, add ASM flags to disable executable stack -->
<cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
<cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags>
<cmakeCFlags>${extraCflags}</cmakeCFlags>
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
<cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
<cmakeCxxFlags>${extraCxxflags} -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
<libssl>libssl.a</libssl>
<libcrypto>libcrypto.a</libcrypto>
<libquiche>libquiche.a</libquiche>
Expand Down Expand Up @@ -278,9 +278,9 @@
<extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
<!-- On *nix, add ASM flags to disable executable stack -->
<cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
<cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags>
<cmakeCFlags>${extraCflags}</cmakeCFlags>
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
<cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
<cmakeCxxFlags>${extraCxxflags} -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
<libssl>libssl.a</libssl>
<libcrypto>libcrypto.a</libcrypto>
<libquiche>libquiche.a</libquiche>
Expand Down Expand Up @@ -461,9 +461,9 @@
<extraCxxflags>-O3 -fno-omit-frame-pointer</extraCxxflags>
<!-- On *nix, add ASM flags to disable executable stack -->
<cmakeAsmFlags>-Wa,--noexecstack</cmakeAsmFlags>
<cmakeCFlags>${extraCflags} -DOPENSSL_C11_ATOMIC</cmakeCFlags>
<cmakeCFlags>${extraCflags}</cmakeCFlags>
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
<cmakeCxxFlags>${extraCxxflags} -DOPENSSL_C11_ATOMIC -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
<cmakeCxxFlags>${extraCxxflags} -Wno-error=maybe-uninitialized -Wno-error=shadow -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS</cmakeCxxFlags>
<libssl>libssl.a</libssl>
<libcrypto>libcrypto.a</libcrypto>
<libquiche>libquiche.a</libquiche>
Expand Down