|
47 | 47 | <boringsslRepository>https://boringssl.googlesource.com/boringssl</boringsslRepository> |
48 | 48 | <!-- Lets use what we use in netty-tcnative-boringssl-static --> |
49 | 49 | <boringsslBranch>main</boringsslBranch> |
50 | | - <boringsslCommitSha>b8c97f5b4bc5d4758612a0430e5c2792d0f9ca7f</boringsslCommitSha> |
| 50 | + <boringsslCommitSha>cccf8525db8a57153d3cb3e22efed2db4b71a8ab</boringsslCommitSha> |
51 | 51 |
|
52 | 52 | <quicheSourceDir>${project.build.directory}/quiche-source</quicheSourceDir> |
53 | 53 | <quicheBuildDir>${quicheSourceDir}/target/release</quicheBuildDir> |
|
68 | 68 | <extraLdflags /> |
69 | 69 | <extraConfigureArg /> |
70 | 70 | <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 | | - --> |
75 | 71 | <macosxDeploymentTarget /> |
76 | 72 | <bundleNativeCode /> |
77 | 73 | <crossCompile /> |
|
107 | 103 | </os> |
108 | 104 | </activation> |
109 | 105 | <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> |
115 | 108 | <!-- On *nix, add ASM flags to disable executable stack --> |
116 | 109 | <cmakeAsmFlags>-Wa,--noexecstack -mmacosx-version-min=${macosxDeploymentTarget}</cmakeAsmFlags> |
117 | 110 | <extraCflags>-mmacosx-version-min=${macosxDeploymentTarget}</extraCflags> |
|
162 | 155 | <jniLibName>netty_quiche_osx_x86_64</jniLibName> |
163 | 156 | <jni.classifier>osx-x86_64</jni.classifier> |
164 | 157 | <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> |
168 | 161 | <!-- 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> |
170 | 163 | <extraCmakeFlags>-DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_OSX_ARCHITECTURES=x86_64</extraCmakeFlags> |
171 | 164 | <cmakeCFlags>${extraCflags} -O3 -fno-omit-frame-pointer</cmakeCFlags> |
172 | 165 | <!-- We need to define __STDC_CONSTANT_MACROS and __STDC_FORMAT_MACROS when building boringssl on centos 6 --> |
|
733 | 726 |
|
734 | 727 | <!-- Only copy the libs and header files we need --> |
735 | 728 | <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" /> |
738 | 731 | <copy todir="${boringsslHomeIncludeDir}" verbose="true"> |
739 | 732 | <fileset dir="${boringsslSourceDir}/include" /> |
740 | 733 | </copy> |
|
0 commit comments