OSDN -- Desarrollar y descargar software de código abierto
Translation Status of Español translation status for es
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revisión570bed36132b4462bf1434276ca44dac6a11c739 (tree)
Tiempo2023-10-13 08:30:30
AutorFs <Fsu0413@vip....>
CommiterFs

Log Message

remove OpenSSL 1.1.1, use OpenSSL 3.0 for Qt 5.15 Android (Test)

Cambiar Resumen

Diferencia incremental

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -4,8 +4,7 @@ local conf = {}
44 --[[
55 abbrs:
66 OpenSSL Versions:
7- o1: OpenSSL 1.1.1w
8- o3: OpenSSL 3.0.11
7+ o3_0: OpenSSL 3.0.11
98
109 Platforms:
1110 w: Windows
@@ -48,216 +47,6 @@ abbrs:
4847
4948 --------------------------------------------------------------------
5049
51--- OpenSSL 1.1.1w
52-
53-conf.o1_1aa3nl = {
54- name = "OpenSSL1.1.1w-Android-arm-NDKr21eAPI21",
55- opensslVersion = "1.1.1w",
56- host = "CentOS8",
57- target = "Android-21",
58- toolchainT = "Android-21-r21e-arm",
59- configureParameter = [[
60- no-asm
61- no-shared
62- enable-static-engine
63- --prefix=//
64- --openssldir=//ssl
65- android-arm
66- -D__ANDROID_API__=21
67- -march=armv7-a
68- -mfloat-abi=softfp
69- -mfpu=vfp
70- -fno-builtin-memmove
71- -mthumb
72- -fstack-protector-strong
73- -fPIC
74- -Wl,-s
75- -Wl,-z,noexecstack
76- ]],
77-}
78-
79-conf.o1_1aa6nl = {
80- name = "OpenSSL1.1.1w-Android-arm64-NDKr21eAPI21",
81- opensslVersion = "1.1.1w",
82- host = "CentOS8",
83- target = "Android-21",
84- toolchainT = "Android-21-r21e-arm64",
85- configureParameter = [[
86- no-asm
87- no-shared
88- enable-static-engine
89- --prefix=//
90- --openssldir=//ssl
91- android-arm64
92- -D__ANDROID_API__=21
93- -fstack-protector-strong
94- -fPIC
95- -Wl,-s
96- -Wl,-z,noexecstack
97- ]],
98-}
99-
100-conf.o1_1ax3nl = {
101- name = "OpenSSL1.1.1w-Android-x86-NDKr21eAPI21",
102- opensslVersion = "1.1.1w",
103- host = "CentOS8",
104- target = "Android-21",
105- toolchainT = "Android-21-r21e-x86",
106- configureParameter = [[
107- no-asm
108- no-shared
109- enable-static-engine
110- --prefix=//
111- --openssldir=//ssl
112- android-x86
113- -D__ANDROID_API__=21
114- -fstack-protector-strong
115- -fPIC
116- -Wl,-s
117- -Wl,-z,noexecstack
118- ]],
119-}
120-
121-conf.o1_1ax6nl = {
122- name = "OpenSSL1.1.1w-Android-x86_64-NDKr21eAPI21",
123- opensslVersion = "1.1.1w",
124- host = "CentOS8",
125- target = "Android-21",
126- toolchainT = "Android-21-r21e-x86_64",
127- configureParameter = [[
128- no-asm
129- no-shared
130- enable-static-engine
131- --prefix=//
132- --openssldir=//ssl
133- android-x86_64
134- -D__ANDROID_API__=21
135- -fstack-protector-strong
136- -fPIC
137- -Wl,-s
138- -Wl,-z,noexecstack
139- ]],
140-}
141-
142-conf.o1_1aalnl = {
143- name = "OpenSSL1.1.1w-Android-ALL-NDKr21eAPI21",
144- opensslVersion = "1.1.1w",
145- host = "CentOS8",
146- opensslUnifyType = "Android",
147- opensslUnifyArch = {
148- ["armeabi-v7a"] = "o1_1aa3nl",
149- ["arm64-v8a"] = "o1_1aa6nl",
150- ["x86"] = "o1_1ax3nl",
151- ["x86_64"] = "o1_1ax6nl",
152- },
153-}
154-
155---------------------------------------------------------------------
156-
157-conf.o1_1aa3n321 = {
158- name = "OpenSSL1.1.1w-Android-arm-NDKr23cAPI21",
159- opensslVersion = "1.1.1w",
160- host = "CentOS8",
161- target = "Android-21",
162- toolchainT = "Android-21-r23c-arm",
163- configureParameter = [[
164- no-asm
165- no-shared
166- enable-static-engine
167- --prefix=//
168- --openssldir=//ssl
169- android-arm
170- -D__ANDROID_API__=21
171- -march=armv7-a
172- -mfloat-abi=softfp
173- -mfpu=vfp
174- -fno-builtin-memmove
175- -mthumb
176- -fstack-protector-strong
177- -fPIC
178- -Wl,-s
179- -Wl,-z,noexecstack
180- ]],
181-}
182-
183-conf.o1_1aa6n321 = {
184- name = "OpenSSL1.1.1w-Android-arm64-NDKr23cAPI21",
185- opensslVersion = "1.1.1w",
186- host = "CentOS8",
187- target = "Android-21",
188- toolchainT = "Android-21-r23c-arm64",
189- configureParameter = [[
190- no-asm
191- no-shared
192- enable-static-engine
193- --prefix=//
194- --openssldir=//ssl
195- android-arm64
196- -D__ANDROID_API__=21
197- -fstack-protector-strong
198- -fPIC
199- -Wl,-s
200- -Wl,-z,noexecstack
201- ]],
202-}
203-
204-conf.o1_1ax3n321 = {
205- name = "OpenSSL1.1.1w-Android-x86-NDKr23cAPI21",
206- opensslVersion = "1.1.1w",
207- host = "CentOS8",
208- target = "Android-21",
209- toolchainT = "Android-21-r23c-x86",
210- configureParameter = [[
211- no-asm
212- no-shared
213- enable-static-engine
214- --prefix=//
215- --openssldir=//ssl
216- android-x86
217- -D__ANDROID_API__=21
218- -fstack-protector-strong
219- -fPIC
220- -Wl,-s
221- -Wl,-z,noexecstack
222- ]],
223-}
224-
225-conf.o1_1ax6n321 = {
226- name = "OpenSSL1.1.1w-Android-x86_64-NDKr23cAPI21",
227- opensslVersion = "1.1.1w",
228- host = "CentOS8",
229- target = "Android-21",
230- toolchainT = "Android-21-r23c-x86_64",
231- configureParameter = [[
232- no-asm
233- no-shared
234- enable-static-engine
235- --prefix=//
236- --openssldir=//ssl
237- android-x86_64
238- -D__ANDROID_API__=21
239- -fstack-protector-strong
240- -fPIC
241- -Wl,-s
242- -Wl,-z,noexecstack
243- ]],
244-}
245-
246-conf.o1_1aaln321 = {
247- name = "OpenSSL1.1.1w-Android-ALL-NDKr23cAPI21",
248- opensslVersion = "1.1.1w",
249- host = "CentOS8",
250- opensslUnifyType = "Android",
251- opensslUnifyArch = {
252- ["armeabi-v7a"] = "o1_1aa3n321",
253- ["arm64-v8a"] = "o1_1aa6n321",
254- ["x86"] = "o1_1ax3n321",
255- ["x86_64"] = "o1_1ax6n321",
256- },
257-}
258-
259---------------------------------------------------------------------
260-
26150 -- OpenSSL 3.0.11
26251
26352 conf.o3_0wx6v9 = {
@@ -681,6 +470,214 @@ conf.o3_0mal = {
681470
682471 --------------------------------------------------------------------
683472
473+conf.o3_0aa3nl = {
474+ name = "OpenSSL3.0.11-Android-arm-NDKr21eAPI21",
475+ opensslVersion = "3.0.11",
476+ host = "CentOS8",
477+ target = "Android-21",
478+ toolchainT = "Android-21-r21e-arm",
479+ configureParameter = [[
480+ no-asm
481+ no-shared
482+ enable-static-engine
483+ --prefix=//
484+ --openssldir=//ssl
485+ android-arm
486+ -D__ANDROID_API__=21
487+ -march=armv7-a
488+ -mfloat-abi=softfp
489+ -mfpu=vfp
490+ -fno-builtin-memmove
491+ -mthumb
492+ -fstack-protector-strong
493+ -fPIC
494+ -Wl,-s
495+ -Wl,-z,noexecstack
496+ ]],
497+}
498+
499+conf.o3_0aa6nl = {
500+ name = "OpenSSL3.0.11-Android-arm64-NDKr21eAPI21",
501+ opensslVersion = "3.0.11",
502+ host = "CentOS8",
503+ target = "Android-21",
504+ toolchainT = "Android-21-r21e-arm64",
505+ configureParameter = [[
506+ no-asm
507+ no-shared
508+ enable-static-engine
509+ --prefix=//
510+ --openssldir=//ssl
511+ android-arm64
512+ -D__ANDROID_API__=21
513+ -fstack-protector-strong
514+ -fPIC
515+ -Wl,-s
516+ -Wl,-z,noexecstack
517+ ]],
518+}
519+
520+conf.o3_0ax3nl = {
521+ name = "OpenSSL3.0.11-Android-x86-NDKr21eAPI21",
522+ opensslVersion = "3.0.11",
523+ host = "CentOS8",
524+ target = "Android-21",
525+ toolchainT = "Android-21-r21e-x86",
526+ configureParameter = [[
527+ no-asm
528+ no-shared
529+ enable-static-engine
530+ --prefix=//
531+ --openssldir=//ssl
532+ android-x86
533+ -D__ANDROID_API__=21
534+ -fstack-protector-strong
535+ -fPIC
536+ -Wl,-s
537+ -Wl,-z,noexecstack
538+ ]],
539+}
540+
541+conf.o3_0ax6nl = {
542+ name = "OpenSSL3.0.11-Android-x86_64-NDKr21eAPI21",
543+ opensslVersion = "3.0.11",
544+ host = "CentOS8",
545+ target = "Android-21",
546+ toolchainT = "Android-21-r21e-x86_64",
547+ configureParameter = [[
548+ no-asm
549+ no-shared
550+ enable-static-engine
551+ --prefix=//
552+ --openssldir=//ssl
553+ android-x86_64
554+ -D__ANDROID_API__=21
555+ -fstack-protector-strong
556+ -fPIC
557+ -Wl,-s
558+ -Wl,-z,noexecstack
559+ ]],
560+}
561+
562+conf.o3_0aalnl = {
563+ name = "OpenSSL3.0.11-Android-ALL-NDKr21eAPI21",
564+ opensslVersion = "3.0.11",
565+ host = "CentOS8",
566+ opensslUnifyType = "Android",
567+ opensslUnifyArch = {
568+ ["armeabi-v7a"] = "o1_1aa3nl",
569+ ["arm64-v8a"] = "o1_1aa6nl",
570+ ["x86"] = "o1_1ax3nl",
571+ ["x86_64"] = "o1_1ax6nl",
572+ },
573+}
574+
575+--------------------------------------------------------------------
576+
577+conf.o3_0aa3n321 = {
578+ name = "OpenSSL3.0.11-Android-arm-NDKr23cAPI21",
579+ opensslVersion = "3.0.11",
580+ host = "CentOS8",
581+ target = "Android-21",
582+ toolchainT = "Android-21-r23c-arm",
583+ configureParameter = [[
584+ no-asm
585+ no-shared
586+ enable-static-engine
587+ --prefix=//
588+ --openssldir=//ssl
589+ android-arm
590+ -D__ANDROID_API__=21
591+ -march=armv7-a
592+ -mfloat-abi=softfp
593+ -mfpu=vfp
594+ -fno-builtin-memmove
595+ -mthumb
596+ -fstack-protector-strong
597+ -fPIC
598+ -Wl,-s
599+ -Wl,-z,noexecstack
600+ ]],
601+}
602+
603+conf.o3_0aa6n321 = {
604+ name = "OpenSSL3.0.11-Android-arm64-NDKr23cAPI21",
605+ opensslVersion = "3.0.11",
606+ host = "CentOS8",
607+ target = "Android-21",
608+ toolchainT = "Android-21-r23c-arm64",
609+ configureParameter = [[
610+ no-asm
611+ no-shared
612+ enable-static-engine
613+ --prefix=//
614+ --openssldir=//ssl
615+ android-arm64
616+ -D__ANDROID_API__=21
617+ -fstack-protector-strong
618+ -fPIC
619+ -Wl,-s
620+ -Wl,-z,noexecstack
621+ ]],
622+}
623+
624+conf.o3_0ax3n321 = {
625+ name = "OpenSSL3.0.11-Android-x86-NDKr23cAPI21",
626+ opensslVersion = "3.0.11",
627+ host = "CentOS8",
628+ target = "Android-21",
629+ toolchainT = "Android-21-r23c-x86",
630+ configureParameter = [[
631+ no-asm
632+ no-shared
633+ enable-static-engine
634+ --prefix=//
635+ --openssldir=//ssl
636+ android-x86
637+ -D__ANDROID_API__=21
638+ -fstack-protector-strong
639+ -fPIC
640+ -Wl,-s
641+ -Wl,-z,noexecstack
642+ ]],
643+}
644+
645+conf.o3_0ax6n321 = {
646+ name = "OpenSSL3.0.11-Android-x86_64-NDKr23cAPI21",
647+ opensslVersion = "3.0.11",
648+ host = "CentOS8",
649+ target = "Android-21",
650+ toolchainT = "Android-21-r23c-x86_64",
651+ configureParameter = [[
652+ no-asm
653+ no-shared
654+ enable-static-engine
655+ --prefix=//
656+ --openssldir=//ssl
657+ android-x86_64
658+ -D__ANDROID_API__=21
659+ -fstack-protector-strong
660+ -fPIC
661+ -Wl,-s
662+ -Wl,-z,noexecstack
663+ ]],
664+}
665+
666+conf.o3_0aaln321 = {
667+ name = "OpenSSL3.0.11-Android-ALL-NDKr23cAPI21",
668+ opensslVersion = "3.0.11",
669+ host = "CentOS8",
670+ opensslUnifyType = "Android",
671+ opensslUnifyArch = {
672+ ["armeabi-v7a"] = "o1_1aa3n321",
673+ ["arm64-v8a"] = "o1_1aa6n321",
674+ ["x86"] = "o1_1ax3n321",
675+ ["x86_64"] = "o1_1ax6n321",
676+ },
677+}
678+
679+--------------------------------------------------------------------
680+
684681 conf.o3_0aa3n324 = {
685682 name = "OpenSSL3.0.11-Android-arm-NDKr23cAPI24",
686683 opensslVersion = "3.0.11",
--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -985,7 +985,7 @@ conf.q5_15wx6g8_aalnl = {
985985 toolchain = "MinGW810-64",
986986 target = "Android-21",
987987 toolchainT = "Android-21-r21e-all",
988- opensslConf = "o1_1aalnl",
988+ opensslConf = "o3_0aalnl",
989989 androidSdkVersion = "20220911",
990990 configureParameter = [[
991991 -prefix
@@ -1037,7 +1037,7 @@ conf.q5_15lx6_aalnl = {
10371037 host = "CentOS8",
10381038 target = "Android-21",
10391039 toolchainT = "Android-21-r21e-all",
1040- opensslConf = "o1_1aalnl",
1040+ opensslConf = "o3_0aalnl",
10411041 androidSdkVersion = "20220911",
10421042 configureParameter = [[
10431043 -prefix
@@ -1089,7 +1089,7 @@ conf.q5_15mx6_aalnl = {
10891089 host = "macOS1015",
10901090 target = "Android-21",
10911091 toolchainT = "Android-21-r21e-all",
1092- opensslConf = "o1_1aalnl",
1092+ opensslConf = "o3_0aalnl",
10931093 androidSdkVersion = "20220911",
10941094 configureParameter = [[
10951095 -prefix
@@ -1141,7 +1141,7 @@ conf.q5_15ma6_aalnl = {
11411141 host = "macOSM1",
11421142 target = "Android-21",
11431143 toolchainT = "Android-21-r21e-all",
1144- opensslConf = "o1_1aalnl",
1144+ opensslConf = "o3_0aalnl",
11451145 androidSdkVersion = "20220911",
11461146 configureParameter = [[
11471147 -prefix
@@ -1194,7 +1194,7 @@ conf.q5_15wx6g8_aaln3 = {
11941194 toolchain = "MinGW810-64",
11951195 target = "Android-21",
11961196 toolchainT = "Android-21-r23c-all",
1197- opensslConf = "o1_1aaln321",
1197+ opensslConf = "o3_0aaln321",
11981198 androidSdkVersion = "20220911",
11991199 configureParameter = [[
12001200 -prefix
@@ -1246,7 +1246,7 @@ conf.q5_15lx6_aaln3 = {
12461246 host = "CentOS8",
12471247 target = "Android-21",
12481248 toolchainT = "Android-21-r23c-all",
1249- opensslConf = "o1_1aaln321",
1249+ opensslConf = "o3_0aaln321",
12501250 androidSdkVersion = "20220911",
12511251 configureParameter = [[
12521252 -prefix
@@ -1298,7 +1298,7 @@ conf.q5_15mx6_aaln3 = {
12981298 host = "macOS1015",
12991299 target = "Android-21",
13001300 toolchainT = "Android-21-r23c-all",
1301- opensslConf = "o1_1aaln321",
1301+ opensslConf = "o3_0aaln321",
13021302 androidSdkVersion = "20220911",
13031303 configureParameter = [[
13041304 -prefix
@@ -1350,7 +1350,7 @@ conf.q5_15ma6_aaln3 = {
13501350 host = "macOSM1",
13511351 target = "Android-21",
13521352 toolchainT = "Android-21-r23c-all",
1353- opensslConf = "o1_1aaln321",
1353+ opensslConf = "o3_0aaln321",
13541354 androidSdkVersion = "20220911",
13551355 configureParameter = [[
13561356 -prefix