Skip to content

Commit 47018ec

Browse files
authored
Update to latest BoringSSL commit sha (#110)
Motivation: It's been a while since we updated our used BoringSSL version. Modifications: - Update to sha of current BoringSSL commit - Fix directory for new boringssl version build output - Increase mac os version to be able to compile boringssl Result: Use latest BoringSSL version as of today
1 parent 38d110d commit 47018ec

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

  • codec-ohttp-hpke-native-boringssl

codec-ohttp-hpke-native-boringssl/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<boringsslRepository>https://boringssl.googlesource.com/boringssl</boringsslRepository>
4949
<!-- Lets use what we use in netty-tcnative-boringssl-static -->
5050
<boringsslBranch>main</boringsslBranch>
51-
<boringsslCommitSha>b8c97f5b4bc5d4758612a0430e5c2792d0f9ca7f</boringsslCommitSha>
51+
<boringsslCommitSha>0226f30467f540a3f62ef48d453f93927da199b6</boringsslCommitSha>
5252

5353
<generatedSourcesDir>${project.build.directory}/generated-sources</generatedSourcesDir>
5454
<templateDir>${project.build.directory}/template</templateDir>
@@ -74,7 +74,7 @@
7474
</os>
7575
</activation>
7676
<properties>
77-
<macosxDeploymentTarget>10.12</macosxDeploymentTarget>
77+
<macosxDeploymentTarget>10.13</macosxDeploymentTarget>
7878
<!-- On *nix, add ASM flags to disable executable stack -->
7979
<cmakeAsmFlags>-Wa,--noexecstack -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags>
8080
<extraCflags>-mmacosx-version-min=${macosxDeploymentTarget}</extraCflags>
@@ -93,7 +93,7 @@
9393
<jniLibName>netty_incubator_codec_ohttp_hpke_boringssl_osx_aarch_64</jniLibName>
9494
<jni.classifier>osx-aarch_64</jni.classifier>
9595
<javaModuleNameClassifier>osx.aarch_64</javaModuleNameClassifier>
96-
<macosxDeploymentTarget>11.0</macosxDeploymentTarget>
96+
<macosxDeploymentTarget>13.0</macosxDeploymentTarget>
9797
<extraCflags>-target arm64-apple-macos11</extraCflags>
9898
<extraCxxflags>-target arm64-apple-macos11</extraCxxflags>
9999
<!-- On *nix, add ASM flags to disable executable stack -->
@@ -118,7 +118,7 @@
118118
<jniLibName>netty_incubator_codec_ohttp_hpke_boringssl_osx_x86_64</jniLibName>
119119
<jni.classifier>osx-x86_64</jni.classifier>
120120
<javaModuleNameClassifier>osx.x86_64</javaModuleNameClassifier>
121-
<macosxDeploymentTarget>10.12</macosxDeploymentTarget>
121+
<macosxDeploymentTarget>10.13</macosxDeploymentTarget>
122122
<extraCflags>-target x86_64-apple-macos10.12 -mmacosx-version-min=${macosxDeploymentTarget}</extraCflags>
123123
<extraCxxflags>-target x86_64-apple-macos10.12</extraCxxflags>
124124
<!-- On *nix, add ASM flags to disable executable stack -->
@@ -313,7 +313,7 @@
313313

314314
<!-- Only copy the libs and header files we need -->
315315
<mkdir dir="${boringsslHomeBuildDir}" />
316-
<copy file="${boringsslBuildDir}/crypto/${libcrypto}" todir="${boringsslHomeBuildDir}" verbose="true" />
316+
<copy file="${boringsslBuildDir}/${libcrypto}" todir="${boringsslHomeBuildDir}" verbose="true" />
317317
<copy todir="${boringsslHomeIncludeDir}" verbose="true">
318318
<fileset dir="${boringsslSourceDir}/include" />
319319
</copy>

0 commit comments

Comments
 (0)