OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

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

Commit MetaInfo

Revisionfcc577ccba58da64ad5f7507b23c6b23ee6c9211 (tree)
Zeit2024-05-10 22:11:12
AutorFs <Fsu0413@vip....>
CommiterFs

Log Message

remove OpenSSL from Qt 6 static builds, also remove the corresponding OpenSSL builds

Ändern Zusammenfassung

Diff

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -66,25 +66,6 @@ conf.o3_0wx6v9 = {
6666 ]],
6767 }
6868
69-conf.o3_0wx6v9st = {
70- name = "OpenSSL3.0.13-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static",
71- opensslVersion = "3.0.13",
72- host = "Win10",
73- toolchain = "MSVC2019-64",
74- variant = {"-static"},
75- staticlibPath = { "lib\\libssl.lib", "lib\\libcrypto.lib" },
76- configureParameter = [[
77- no-asm
78- no-shared
79- enable-static-engine
80- --prefix="&INSTALLROOT&"
81- --openssldir="&INSTALLROOT&\ssl"
82- VC-WIN64A
83- -FS
84- -MT
85- ]],
86-}
87-
8869 conf.o3_0wx6v2 = {
8970 name = "OpenSSL3.0.13-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
9071 opensslVersion = "3.0.13",
@@ -119,25 +100,6 @@ conf.o3_0wa6v2 = {
119100 ]],
120101 }
121102
122-conf.o3_0wx6v2st = {
123- name = "OpenSSL3.0.13-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static",
124- opensslVersion = "3.0.13",
125- host = "Win10",
126- toolchain = "MSVC2022-64",
127- variant = {"-static"},
128- staticlibPath = { "lib\\libssl.lib", "lib\\libcrypto.lib" },
129- configureParameter = [[
130- no-asm
131- no-shared
132- enable-static-engine
133- --prefix="&INSTALLROOT&"
134- --openssldir="&INSTALLROOT&\ssl"
135- VC-WIN64A
136- -FS
137- -MT
138- ]],
139-}
140-
141103 --------------------------------------------------------------------
142104
143105 conf.o3_0wx6g1 = {
@@ -335,115 +297,12 @@ conf.o3_0wx6s8 = {
335297
336298 --------------------------------------------------------------------
337299
338-conf.o3_0wx6g1st = {
339- name = "OpenSSL3.0.13-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-static",
340- opensslVersion = "3.0.13",
341- host = "Win10SH",
342- toolchain = "MinGW1120-64",
343- variant = {"-static"},
344- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
345- configureParameter = [[
346- no-asm
347- no-shared
348- enable-static-engine
349- --prefix="&INSTALLROOT&"
350- --openssldir="&INSTALLROOT&/ssl"
351- --libdir="&INSTALLROOT&/lib"
352- mingw64
353- --static
354- -static-libgcc
355- ]],
356-}
357-
358-conf.o3_0wx6p2st = {
359- name = "OpenSSL3.0.13-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static",
360- opensslVersion = "3.0.13",
361- host = "Win10SH",
362- toolchain = "MinGW122u-64",
363- variant = {"-static"},
364- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
365- configureParameter = [[
366- no-asm
367- no-shared
368- enable-static-engine
369- --prefix="&INSTALLROOT&"
370- --openssldir="&INSTALLROOT&/ssl"
371- --libdir="&INSTALLROOT&/lib"
372- mingw64
373- --static
374- -static-libgcc
375- ]],
376-}
377-
378-conf.o3_0wx6g2st = {
379- name = "OpenSSL3.0.13-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static",
380- opensslVersion = "3.0.13",
381- host = "Win10SH",
382- toolchain = "MinGW1220-64",
383- variant = {"-static"},
384- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
385- configureParameter = [[
386- no-asm
387- no-shared
388- enable-static-engine
389- --prefix="&INSTALLROOT&"
390- --openssldir="&INSTALLROOT&/ssl"
391- --libdir="&INSTALLROOT&/lib"
392- mingw64
393- --static
394- -static-libgcc
395- ]],
396-}
397-
398-conf.o3_0wx6p3st = {
399- name = "OpenSSL3.0.13-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static",
400- opensslVersion = "3.0.13",
401- host = "Win10SH",
402- toolchain = "MinGW132u-64",
403- variant = {"-static"},
404- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
405- configureParameter = [[
406- no-asm
407- no-shared
408- enable-static-engine
409- --prefix="&INSTALLROOT&"
410- --openssldir="&INSTALLROOT&/ssl"
411- --libdir="&INSTALLROOT&/lib"
412- mingw64
413- --static
414- -static-libgcc
415- ]],
416-}
417-
418-conf.o3_0wx6g3st = {
419- name = "OpenSSL3.0.13-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static",
420- opensslVersion = "3.0.13",
421- host = "Win10SH",
422- toolchain = "MinGW1320-64",
423- variant = {"-static"},
424- staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" },
425- configureParameter = [[
426- no-asm
427- no-shared
428- enable-static-engine
429- --prefix="&INSTALLROOT&"
430- --openssldir="&INSTALLROOT&/ssl"
431- --libdir="&INSTALLROOT&/lib"
432- mingw64
433- --static
434- -static-libgcc
435- ]],
436-}
437-
438---------------------------------------------------------------------
439-
440300 -- cross build this configuration for easy unify
441301 conf.o3_0mx6 = {
442302 name = "OpenSSL3.0.13-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
443303 opensslVersion = "3.0.13",
444304 host = "macOSM1",
445305 libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
446- staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
447306 configureParameter = [[
448307 no-asm
449308 shared
@@ -460,7 +319,6 @@ conf.o3_0ma6 = {
460319 opensslVersion = "3.0.13",
461320 host = "macOSM1",
462321 libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
463- staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
464322 configureParameter = [[
465323 no-asm
466324 shared
@@ -477,7 +335,6 @@ conf.o3_0mal = {
477335 opensslVersion = "3.0.13",
478336 host = "macOSM1",
479337 libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
480- staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },
481338 opensslUnifyType = "macOS",
482339 opensslUnifyArch = {
483340 ["arm64"] = "o3_0ma6",
--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -2077,7 +2077,6 @@ conf.q6_2wx6v9sf = {
20772077 host = "Win10",
20782078 toolchain = "MSVC2019-64",
20792079 variant = {"-static(Full)"},
2080- opensslConf = "o3_0wx6v9st",
20812080 useCMake = "27",
20822081 configureParameter = [[
20832082 -GNinja
@@ -2097,10 +2096,7 @@ conf.q6_2wx6v9sf = {
20972096 -DFEATURE_icu=OFF
20982097 -DFEATURE_opengl_dynamic=ON
20992098 -DFEATURE_ssl=ON
2100- -DFEATURE_openssl=ON
2101- -DINPUT_openssl=linked
2102- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
2103- -DOPENSSL_USE_STATIC_LIBS=TRUE
2099+ -DFEATURE_openssl=OFF
21042100 -DFEATURE_schannel=ON
21052101 -DFEATURE_sql_sqlite=ON
21062102 -DFEATURE_sql_odbc=ON
@@ -2287,7 +2283,6 @@ conf.q6_2wx6g1sf = {
22872283 host = "Win10",
22882284 toolchain = "MinGW1120-64",
22892285 variant = {"-static(Full)"},
2290- opensslConf = "o3_0wx6g1st",
22912286 useCMake = "27",
22922287 configureParameter = [[
22932288 -GNinja
@@ -2307,10 +2302,7 @@ conf.q6_2wx6g1sf = {
23072302 -DFEATURE_icu=OFF
23082303 -DFEATURE_opengl_dynamic=ON
23092304 -DFEATURE_ssl=ON
2310- -DFEATURE_openssl=ON
2311- -DINPUT_openssl=linked
2312- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
2313- -DOPENSSL_USE_STATIC_LIBS=TRUE
2305+ -DFEATURE_openssl=OFF
23142306 -DFEATURE_schannel=ON
23152307 -DFEATURE_sql_sqlite=ON
23162308 -DFEATURE_sql_odbc=ON
@@ -2929,7 +2921,6 @@ conf.q6_2malsf = {
29292921 qtVersion = "6.2.8",
29302922 host = "macOSM1",
29312923 variant = {"-static(Full)"},
2932- opensslConf = "o3_0mal",
29332924 useCMake = "27",
29342925 configureParameter = [[
29352926 -GNinja
@@ -2950,10 +2941,7 @@ conf.q6_2malsf = {
29502941 -DFEATURE_opengl=ON
29512942 -DFEATURE_opengles2=OFF
29522943 -DFEATURE_ssl=ON
2953- -DFEATURE_openssl=ON
2954- -DINPUT_openssl=linked
2955- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
2956- -DOPENSSL_USE_STATIC_LIBS=TRUE
2944+ -DFEATURE_openssl=OFF
29572945 -DFEATURE_securetransport=ON
29582946 -DFEATURE_sql_sqlite=ON
29592947 -DFEATURE_system_sqlite=OFF
@@ -4049,7 +4037,6 @@ conf.q6_5wx6v2sf = {
40494037 host = "Win10",
40504038 toolchain = "MSVC2022-64",
40514039 variant = {"-static(Full)"},
4052- opensslConf = "o3_0wx6v2st",
40534040 useCMake = "Latest",
40544041 configureParameter = [[
40554042 -GNinja
@@ -4069,10 +4056,7 @@ conf.q6_5wx6v2sf = {
40694056 -DFEATURE_icu=OFF
40704057 -DFEATURE_opengl_dynamic=ON
40714058 -DFEATURE_ssl=ON
4072- -DFEATURE_openssl=ON
4073- -DINPUT_openssl=linked
4074- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
4075- -DOPENSSL_USE_STATIC_LIBS=TRUE
4059+ -DFEATURE_openssl=OFF
40764060 -DFEATURE_schannel=ON
40774061 -DFEATURE_sql_sqlite=ON
40784062 -DFEATURE_sql_odbc=ON
@@ -4165,7 +4149,6 @@ conf.q6_5wx6p2sf = {
41654149 host = "Win10",
41664150 toolchain = "MinGW122u-64",
41674151 variant = {"-static(Full)"},
4168- opensslConf = "o3_0wx6p2st",
41694152 useCMake = "Latest",
41704153 configureParameter = [[
41714154 -GNinja
@@ -4185,10 +4168,7 @@ conf.q6_5wx6p2sf = {
41854168 -DFEATURE_icu=OFF
41864169 -DFEATURE_opengl_dynamic=ON
41874170 -DFEATURE_ssl=ON
4188- -DFEATURE_openssl=ON
4189- -DINPUT_openssl=linked
4190- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
4191- -DOPENSSL_USE_STATIC_LIBS=TRUE
4171+ -DFEATURE_openssl=OFF
41924172 -DFEATURE_schannel=ON
41934173 -DFEATURE_sql_sqlite=ON
41944174 -DFEATURE_sql_odbc=ON
@@ -4304,7 +4284,6 @@ conf.q6_5wx6g2sf = {
43044284 host = "Win10",
43054285 toolchain = "MinGW1220-64",
43064286 variant = {"-static(Full)"},
4307- opensslConf = "o3_0wx6g2st",
43084287 useCMake = "Latest",
43094288 configureParameter = [[
43104289 -GNinja
@@ -4324,10 +4303,7 @@ conf.q6_5wx6g2sf = {
43244303 -DFEATURE_icu=OFF
43254304 -DFEATURE_opengl_dynamic=ON
43264305 -DFEATURE_ssl=ON
4327- -DFEATURE_openssl=ON
4328- -DINPUT_openssl=linked
4329- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
4330- -DOPENSSL_USE_STATIC_LIBS=TRUE
4306+ -DFEATURE_openssl=OFF
43314307 -DFEATURE_schannel=ON
43324308 -DFEATURE_sql_sqlite=ON
43334309 -DFEATURE_sql_odbc=ON
@@ -4382,7 +4358,6 @@ conf.q6_5wx6p3sf = {
43824358 host = "Win10",
43834359 toolchain = "MinGW132u-64",
43844360 variant = {"-static(Full)"},
4385- opensslConf = "o3_0wx6p3st",
43864361 useCMake = "Latest",
43874362 configureParameter = [[
43884363 -GNinja
@@ -4402,10 +4377,7 @@ conf.q6_5wx6p3sf = {
44024377 -DFEATURE_icu=OFF
44034378 -DFEATURE_opengl_dynamic=ON
44044379 -DFEATURE_ssl=ON
4405- -DFEATURE_openssl=ON
4406- -DINPUT_openssl=linked
4407- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
4408- -DOPENSSL_USE_STATIC_LIBS=TRUE
4380+ -DFEATURE_openssl=OFF
44094381 -DFEATURE_schannel=ON
44104382 -DFEATURE_sql_sqlite=ON
44114383 -DFEATURE_sql_odbc=ON
@@ -4460,7 +4432,6 @@ conf.q6_5wx6g3sf = {
44604432 host = "Win10",
44614433 toolchain = "MinGW1320-64",
44624434 variant = {"-static(Full)"},
4463- opensslConf = "o3_0wx6g3st",
44644435 useCMake = "Latest",
44654436 configureParameter = [[
44664437 -GNinja
@@ -4480,10 +4451,7 @@ conf.q6_5wx6g3sf = {
44804451 -DFEATURE_icu=OFF
44814452 -DFEATURE_opengl_dynamic=ON
44824453 -DFEATURE_ssl=ON
4483- -DFEATURE_openssl=ON
4484- -DINPUT_openssl=linked
4485- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
4486- -DOPENSSL_USE_STATIC_LIBS=TRUE
4454+ -DFEATURE_openssl=OFF
44874455 -DFEATURE_schannel=ON
44884456 -DFEATURE_sql_sqlite=ON
44894457 -DFEATURE_sql_odbc=ON
@@ -4965,7 +4933,6 @@ conf.q6_5malsf = {
49654933 qtVersion = "6.5.3",
49664934 host = "macOSM1",
49674935 variant = {"-static(Full)"},
4968- opensslConf = "o3_0mal",
49694936 useCMake = "Latest",
49704937 configureParameter = [[
49714938 -GNinja
@@ -4986,10 +4953,7 @@ conf.q6_5malsf = {
49864953 -DFEATURE_opengl=ON
49874954 -DFEATURE_opengles2=OFF
49884955 -DFEATURE_ssl=ON
4989- -DFEATURE_openssl=ON
4990- -DINPUT_openssl=linked
4991- -DOPENSSL_ROOT_DIR="&OPENSSLDIR&"
4992- -DOPENSSL_USE_STATIC_LIBS=TRUE
4956+ -DFEATURE_openssl=OFF
49934957 -DFEATURE_securetransport=ON
49944958 -DFEATURE_sql_sqlite=ON
49954959 -DFEATURE_system_sqlite=OFF