Commit: 5bffb285ebb603b11c18e449bcdbe819fef36003 - Fs-scripts (git)

Commit MetaInfo

• Revisão: 5bffb285ebb603b11c18e449bcdbe819fef36003 (tree)
• Hora: 2024-08-17 19:25:02
• Autor: Fs <Fsu0413@vip....>
• Commiter: Fs

Mensagem de Log

deal with OpenSSL rpath (Trial 1)

Mudança Sumário

• modified: Compile/lib/Configuration.lua
• modified: Compile/lib/Generate.lua

Diff

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -862,6 +862,33 @@ conf.OpenSSL.generateConfTable = function(self, host, job)
 		ret.INSTALLROOT = installRoot
 		ret.INSTALLPATH = installFolderName
 
+		ret.EXTRAINSTALL = ""
+
+		if (not jobConfigureDetail.crossCompile) and (string.sub(conf.hostToConfMap[host], 1, 3) == "mac") then
+			-- macOS hosts needs the library id changed. By default OpenSSL builds with full path in ID.
+			local libs = {}
+			for _, l in ipairs(jobConfigureDetail.libPath) do
+				local s, e = string.find(l, "/", 1, true)
+				local e2
+				while s do
+					e2 = e
+					s, e = string.find(l, "/", e + 1, true)
+				end
+				table.insert(libs, {p = string.sub(l, 1, e2 - 1), n = string.sub(l, e2 + 1)})
+			end
+
+			for _, lib in ipairs(libs) do
+				ret.EXTRAINSTALL = ret.EXTRAINSTALL .. "\ncd \"" .. installRoot .. "/" .. lib.p .. "\""
+				for _, lib2 in ipairs(libs) do
+					if (lib.p == lib2.p) and (lib.n == lib2.n) then
+						ret.EXTRAINSTALL = ret.EXTRAINSTALL .. "\ninstall_name_tool -id \"" .. lib.n .. "\" \"" .. lib.n .. "\""
+					else
+						ret.EXTRAINSTALL = ret.EXTRAINSTALL .. "\ninstall_name_tool -change \"" .. installRoot .. "/" .. lib2.p .. "/" .. lib2.n .. "\" \"" .. lib2.n .. "\" \"" .. lib.n .. "\"\n"
+					end
+				end
+			end
+		end
+
 		-- finally, data required for generating website data
 		ret.buildContentVersion = jobConfigureDetail.opensslVersion
 		ret.buildHost = host

--- a/Compile/lib/Generate.lua
+++ b/Compile/lib/Generate.lua
@@ -483,6 +483,7 @@ exit 0
 -- INSTALLCOMMANDLINE
 -- INSTALLROOT
 -- INSTALLPATH
+-- EXTRAINSTALL
 gen.unix.template4OpenSSL = [[
 set -x
 
@@ -580,6 +581,10 @@ if &INSTALLCOMMANDLINE&; then break; fi
 if [ $i -eq 4 ]; then exit 1; fi
 done
 
+cd &WORKSPACE&/buildDir
+
+&EXTRAINSTALL&
+
 cd &INSTALLROOT&/..
 
 $TAR -cf - &INSTALLPATH& | $SEVENZIP a -txz -m0=LZMA2:d256m:fb273 -mmt=3 -myx -si -- &INSTALLPATH&.tar.xz