Date: Thu, 16 Jan 2025 21:26:19 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 01efbf239baa - main - games/0ad: Fix build when HOSTTYPE is defined in the env Message-ID: <202501162126.50GLQJB1067768@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=01efbf239baaddf6a729627f7ee1709f61955efc commit 01efbf239baaddf6a729627f7ee1709f61955efc Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2025-01-16 21:24:33 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2025-01-16 21:24:33 +0000 games/0ad: Fix build when HOSTTYPE is defined in the env Reported by: dinoex (via IRC) Tested by: dinoex MFH: 2025Q1 --- games/0ad/files/patch-build_premake_premake5.lua | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/games/0ad/files/patch-build_premake_premake5.lua b/games/0ad/files/patch-build_premake_premake5.lua index 2d771dbba940..55122f32fc49 100644 --- a/games/0ad/files/patch-build_premake_premake5.lua +++ b/games/0ad/files/patch-build_premake_premake5.lua @@ -1,6 +1,25 @@ ---- build/premake/premake5.lua.orig 2021-07-27 21:57:08 UTC +--- build/premake/premake5.lua.orig 2022-09-23 19:16:45 UTC +++ build/premake/premake5.lua -@@ -367,7 +367,7 @@ function project_set_build_flags() +@@ -76,14 +76,10 @@ else + end + else + local machine = "x86_64" +- if os.getenv("HOSTTYPE") and os.getenv("HOSTTYPE") ~= '' then +- machine = os.getenv("HOSTTYPE") +- else +- os.execute(cc .. " -dumpmachine > .gccmachine.tmp") +- local f = io.open(".gccmachine.tmp", "r") +- machine = f:read("*line") +- f:close() +- end ++ os.execute(cc .. " -dumpmachine > .gccmachine.tmp") ++ local f = io.open(".gccmachine.tmp", "r") ++ machine = f:read("*line") ++ f:close() + -- Special handling on mac os where xcode needs special flags. + if os.istarget("macosx") then + if string.find(machine, "arm64") then +@@ -380,7 +376,7 @@ function project_set_build_flags() if os.istarget("linux") or os.istarget("bsd") then if _OPTIONS["prefer-local-libs"] then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501162126.50GLQJB1067768>