Commit: a5507cc91fb3c6395c021625acd00ef204bd5c8b - Fs-scripts (git)

Commit MetaInfo

• Revision: a5507cc91fb3c6395c021625acd00ef204bd5c8b (tree)
• Time: 2023-01-28 07:38:28
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

workaround QTBUG-102877

Signed-off-by: Fs <[e-mail]>

Change Summary

• modified: Compile/lib/Configuration.lua
• modified: qt6_deploy_host.sh
• modified: qt6_deploy_host.vbs
• add: qtconf-ForQt6.2Static

Incremental Difference

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -475,19 +475,25 @@ conf.Qt.generateConfTable = function(self, host, job)
 		if confHost.makefileTemplate == "win" then
 			file = string.gsub(file, "%/", "\\")
 		end
-		ret.EXTRAINSTALL = ret.EXTRAINSTALL .. copyCmd .. " " .. ret.BUILDDIR .. confHost.pathSep .. file .. " " .. installRoot .. "\n"
+		ret.EXTRAINSTALL = ret.EXTRAINSTALL .. copyCmd .. ret.BUILDDIR .. confHost.pathSep .. file .. " " .. installRoot .. "\n"
+	end
+
+	-- check for static builds
+	local staticBuild = false
+	for _, v in ipairs(confDetail.variant) do
+		if (v == "-static") or (v == "-staticFull") then
+			staticBuild = true
+			break
+		end
+	end
+
+	-- hack for static Qt 6.2 series: they can't be used without workaround of qt.conf
+	if staticBuild and (string.sub(confDetail.qtVersion, 1, 4) == "6.2.") then
+		ret.EXTRAINSTALL = ret.EXTRAINSTALL .. copyCmd .. scriptPath .. confHost.pathSep .. ".." .. confHost.pathSep .. "qtconf-ForQt6.2Static" .. " " .. installRoot .. confHost.pathSep .. "bin" .. confHost.pathSep .. "qt.conf\n"
 	end
 
 	-- OpenSSL libraries
 	if confDetail.opensslConf then
-		-- check for static builds
-		local staticBuild = false
-		for _, v in ipairs(confDetail.variant) do
-			if (v == "-static") or (v == "-staticFull") then
-				staticBuild = true
-				break
-			end
-		end
 		local opensslLibPath = conf.OpenSSL.configurations[confDetail.opensslConf][(staticBuild and "static" or "") .. "libPath"]
 		if opensslLibPath then
 			local targetDir = "lib"

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -31,6 +31,7 @@ fi
 
 mkdir "${PATH_TO_TARGET}/host"
 cp -R "${PATH_TO_HOST}/bin" "${PATH_TO_TARGET}/host/"
+[ -e "${PATH_TO_TARGET}/host/bin/qt.conf" ] && rm "${PATH_TO_TARGET}/host/bin/qt.conf"
 [ -d "${PATH_TO_HOST}/libexec" ] && cp -R "${PATH_TO_HOST}/libexec" "${PATH_TO_TARGET}/host/"
 mkdir "${PATH_TO_TARGET}/host/lib"
 cp -R "${PATH_TO_HOST}/lib/cmake" "${PATH_TO_TARGET}/host/lib/"
@@ -59,6 +60,8 @@ chmod +x "${PATH_TO_TARGET}/bin/qmake"
 	echo "\$script_dir_path/../host/bin/qtpaths -qtconf \"\$script_dir_path/target_qt.conf\" \$*"
 ) > "${PATH_TO_TARGET}/bin/qtpaths"
 
+chmod +x "${PATH_TO_TARGET}/bin/qtpaths"
+
 # judge if sed / gsed is GNU sed
 GNU_SED=
 
@@ -76,8 +79,6 @@ if [ x"$GNU_SED" = x ]; then
 	GNU_SED=sed
 fi
 
-chmod +x "${PATH_TO_TARGET}/bin/qtpaths"
-
 $GNU_SED -i -e 's,^HostPrefix=.*$,HostPrefix=../host,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
 $GNU_SED -i -e 's,^HostData=.*$,HostData=..,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
 

--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -26,6 +26,7 @@ End If
 
 fso.CreateFolder PATH_TO_TARGET & "\host"
 fso.CopyFolder PATH_TO_HOST & "\bin", PATH_TO_TARGET & "\host\bin"
+If fso.FileExists(PATH_TO_TARGET & "\host\bin\qt.conf") Then fso.DeleteFile PATH_TO_TARGET & "\host\bin\qt.conf"
 If fso.FolderExists(PATH_TO_HOST & "\libexec") Then fso.CopyFolder PATH_TO_HOST & "\libexec", PATH_TO_TARGET & "\host\libexec"
 fso.CreateFolder PATH_TO_TARGET & "\host\lib"
 fso.CopyFolder PATH_TO_HOST & "\lib\cmake", PATH_TO_TARGET & "\host\lib\cmake"

--- /dev/null
+++ b/qtconf-ForQt6.2Static
@@ -0,0 +1,3 @@
+[Paths]
+Prefix=..
+HostPrefix=..