Skip to content

Commit 7273679

Browse files
authored
Update to latest boringssl sha (#794)
Motivation: BoringSSL had an important fix that we want to consume https://boringssl.googlesource.com/boringssl/+/cccf8525db8a57153d3cb3e22efed2db4b71a8ab Modifications: Update to latest sha Result: Use latest boringssl code
1 parent 7415d01 commit 7273679

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

codec-native-quic/pom.xml

Lines changed: 9 additions & 16 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>main</boringsslBranch>
50-
<boringsslCommitSha>b8c97f5b4bc5d4758612a0430e5c2792d0f9ca7f</boringsslCommitSha>
50+
<boringsslCommitSha>cccf8525db8a57153d3cb3e22efed2db4b71a8ab</boringsslCommitSha>
5151

5252
<quicheSourceDir>${project.build.directory}/quiche-source</quicheSourceDir>
5353
<quicheBuildDir>${quicheSourceDir}/target/release</quicheBuildDir>
@@ -68,10 +68,6 @@
6868
<extraLdflags />
6969
<extraConfigureArg />
7070
<extraConfigureArg2 />
71-
<!-- We need 10.12 as minimum to compile quiche and use it.
72-
Anything below will fail when trying to load quiche with:
73-
Symbol not found: ___isPlatformVersionAtLeast
74-
-->
7571
<macosxDeploymentTarget />
7672
<bundleNativeCode />
7773
<crossCompile />
@@ -107,11 +103,8 @@
107103
</os>
108104
</activation>
109105
<properties>
110-
<!-- We need 10.12 as minimum to compile quiche and use it.
111-
Anything below will fail when trying to load quiche with:
112-
Symbol not found: ___isPlatformVersionAtLeast
113-
-->
114-
<macosxDeploymentTarget>10.12</macosxDeploymentTarget>
106+
<!-- We need 10.13 as minimum to compile quiche and boringssl -->
107+
<macosxDeploymentTarget>10.13</macosxDeploymentTarget>
115108
<!-- On *nix, add ASM flags to disable executable stack -->
116109
<cmakeAsmFlags>-Wa,--noexecstack -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
117110
<extraCflags>-mmacosx-version-min=${macosxDeploymentTarget}</extraCflags>
@@ -162,11 +155,11 @@
162155
<jniLibName>netty_quiche_osx_x86_64</jniLibName>
163156
<jni.classifier>osx-x86_64</jni.classifier>
164157
<javaModuleNameClassifier>osx.x86_64</javaModuleNameClassifier>
165-
<macosxDeploymentTarget>10.12</macosxDeploymentTarget>
166-
<extraCflags>-target x86_64-apple-macos10.12 -mmacosx-version-min=${macosxDeploymentTarget}</extraCflags>
167-
<extraCxxflags>-target x86_64-apple-macos10.12</extraCxxflags>
158+
<macosxDeploymentTarget>10.13</macosxDeploymentTarget>
159+
<extraCflags>-target x86_64-apple-macos10.13 -mmacosx-version-min=${macosxDeploymentTarget}</extraCflags>
160+
<extraCxxflags>-target x86_64-apple-macos10.13</extraCxxflags>
168161
<!-- On *nix, add ASM flags to disable executable stack -->
169-
<cmakeAsmFlags>-Wa,--noexecstack -target x86_64-apple-macos10.12 -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
162+
<cmakeAsmFlags>-Wa,--noexecstack -target x86_64-apple-macos10.13 -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
170163
<extraCmakeFlags>-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64</extraCmakeFlags>
171164
<cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags>
172165
<!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 -->
@@ -733,8 +726,8 @@
733726

734727
<!-- Only copy the libs and header files we need -->
735728
<mkdir dir="${boringsslHomeBuildDir}" />
736-
<copy file="${boringsslBuildDir}/ssl/${libssl}" todir="${boringsslHomeBuildDir}" verbose="true" />
737-
<copy file="${boringsslBuildDir}/crypto/${libcrypto}" todir="${boringsslHomeBuildDir}" verbose="true" />
729+
<copy file="${boringsslBuildDir}/${libssl}" todir="${boringsslHomeBuildDir}" verbose="true" />
730+
<copy file="${boringsslBuildDir}/${libcrypto}" todir="${boringsslHomeBuildDir}" verbose="true" />
738731
<copy todir="${boringsslHomeIncludeDir}" verbose="true">
739732
<fileset dir="${boringsslSourceDir}/include" />
740733
</copy>

0 commit comments

Comments
 (0)