Commit: 4a810fa24aaaf5fbbcafba8f3bf4606350f06c60 - Fs-scripts (git)

Commit MetaInfo

• Revision: 4a810fa24aaaf5fbbcafba8f3bf4606350f06c60 (tree)
• Time: 2022-11-05 21:51:51
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

android ndk r23 series for Qt 5.15.7

Change Summary

• modified: Compile/lib/opensslCompile/conf.lua
• modified: Compile/lib/qtCompile/conf.lua

Incremental Difference

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -333,6 +333,105 @@ conf.o1aalnl = {
 
 --------------------------------------------------------------------
 
+conf.o1aa3n321 = {
+	name = "OpenSSL1.1.1s-Android-arm-NDKr23cAPI21",
+	opensslVersion = "1.1.1s",
+	host = "CentOS8",
+	target = "Android-21",
+	toolchainT = "Android-21-r23c-arm",
+	configureParameter = [[
+		no-asm
+		no-shared
+		--prefix=//
+		--openssldir=//ssl
+		android-arm
+		-D__ANDROID_API__=21
+		-march=armv7-a
+		-mfloat-abi=softfp
+		-mfpu=vfp
+		-fno-builtin-memmove
+		-mthumb
+		-fstack-protector-strong
+		-fPIC
+		-Wl,-s
+		-Wl,-z,noexecstack
+	]],
+}
+
+conf.o1aa6n321 = {
+	name = "OpenSSL1.1.1s-Android-arm64-NDKr23cAPI21",
+	opensslVersion = "1.1.1s",
+	host = "CentOS8",
+	target = "Android-21",
+	toolchainT = "Android-21-r23c-arm64",
+	configureParameter = [[
+		no-asm
+		no-shared
+		--prefix=//
+		--openssldir=//ssl
+		android-arm64
+		-D__ANDROID_API__=21
+		-fstack-protector-strong
+		-fPIC
+		-Wl,-s
+		-Wl,-z,noexecstack
+	]],
+}
+
+conf.o1ax3n321 = {
+	name = "OpenSSL1.1.1s-Android-x86-NDKr23cAPI21",
+	opensslVersion = "1.1.1s",
+	host = "CentOS8",
+	target = "Android-21",
+	toolchainT = "Android-21-r23c-x86",
+	configureParameter = [[
+		no-asm
+		no-shared
+		--prefix=//
+		--openssldir=//ssl
+		android-x86
+		-D__ANDROID_API__=21
+		-fstack-protector-strong
+		-fPIC
+		-Wl,-s
+		-Wl,-z,noexecstack
+	]],
+}
+
+conf.o1ax6n321 = {
+	name = "OpenSSL1.1.1s-Android-x86_64-NDKr23cAPI21",
+	opensslVersion = "1.1.1s",
+	host = "CentOS8",
+	target = "Android-21",
+	toolchainT = "Android-21-r23c-x86_64",
+	configureParameter = [[
+		no-asm
+		no-shared
+		--prefix=//
+		--openssldir=//ssl
+		android-x86_64
+		-D__ANDROID_API__=21
+		-fstack-protector-strong
+		-fPIC
+		-Wl,-s
+		-Wl,-z,noexecstack
+	]],
+}
+
+conf.o1aaln321 = {
+	name = "OpenSSL1.1.1s-Android-ALL-NDKr23cAPI21",
+	opensslVersion = "1.1.1s",
+	host = "CentOS8",
+	opensslAndroidAll = {
+		["armeabi-v7a"] = "o1aa3n321",
+		["arm64-v8a"] = "o1aa6n321",
+		["x86"] = "o1ax3n321",
+		["x86_64"] = "o1ax6n321",
+	},
+}
+
+--------------------------------------------------------------------
+
 -- OpenSSL 3.0.7
 
 conf.o3wx6v9 = {

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -1990,14 +1990,14 @@ conf.Q5mx6nf = {
 	]],
 }
 
-conf.Q5wx6m8_aalnl = {
-	name = "Qt5.15.7-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
+conf.Q5wx6m8_aaln3 = {
+	name = "Qt5.15.7-Android-ALL-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&",
 	qtVersion = "5.15.7",
 	host = "Win10",
 	toolchain = "MinGW810-64",
 	target = "Android-21",
-	toolchainT = "Android-21-r21e-all",
-	opensslConf = "o1aalnl",
+	toolchainT = "Android-21-r23c-all",
+	opensslConf = "o1aaln321",
 	androidSdkVersion = "Latest",
 	configureParameter = [[
 		-prefix
@@ -2043,13 +2043,13 @@ conf.Q5wx6m8_aalnl = {
 	]],
 }
 
-conf.Q5lx6_aalnl = {
-	name = "Qt5.15.7-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
+conf.Q5lx6_aaln3 = {
+	name = "Qt5.15.7-Android-ALL-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
 	qtVersion = "5.15.7",
 	host = "CentOS8",
 	target = "Android-21",
-	toolchainT = "Android-21-r21e-all",
-	opensslConf = "o1aalnl",
+	toolchainT = "Android-21-r23c-all",
+	opensslConf = "o1aaln321",
 	androidSdkVersion = "Latest",
 	configureParameter = [[
 		-prefix
@@ -2095,13 +2095,13 @@ conf.Q5lx6_aalnl = {
 	]],
 }
 
-conf.Q5mx6_aalnl = {
-	name = "Qt5.15.7-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
+conf.Q5mx6_aaln3 = {
+	name = "Qt5.15.7-Android-ALL-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.7",
 	host = "macOSLegacy",
 	target = "Android-21",
-	toolchainT = "Android-21-r21e-all",
-	opensslConf = "o1aalnl",
+	toolchainT = "Android-21-r23c-all",
+	opensslConf = "o1aaln321",
 	androidSdkVersion = "Latest",
 	configureParameter = [[
 		-prefix