From nobody Thu Jan 16 21:26:19 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YYwsR3J9Xz5kx1b; Thu, 16 Jan 2025 21:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YYwsR2M4sz43Qn; Thu, 16 Jan 2025 21:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737062779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4MT3/R80hFUW0dNRwV0Ne+JemjuXZZJoSno1CThVDYA=; b=DEyf5T3Pgnep+rObbzoRkpM1K/yj6hd0D20VM7FXLI4mdtRnVnVPLhc9WmOeUPsKdUQHOY aHH5CwvvuWvwI4I7iz4kI2C27AM5syh0xz2BaIZfzrfCqlQlRbX7oT2M7ueXKwnscXu8Wq /2psnfAS/PQyVx/faP2eG5y/PlkIq0Lf1P7kww+Nw7wqfwOD8wFuGYYQlc32OMEGXba0nn B8yiRNHOEQp8Ayt5EA3Fc0XwW9Lr2DM5HWYemYSxyWFV0iDw+bgm0KQHKmAuZYAxp34DTe Iluxfkly3+xV43wVHPRFpAsPOU4h4xf+s/mL5uPW6iLu39k1/bHlqML85CjL9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737062779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4MT3/R80hFUW0dNRwV0Ne+JemjuXZZJoSno1CThVDYA=; b=Xqj/6RtjAtO/PBLX8P9/+9dzdbOJbEg/fSpJG1SKJPXScGvDy6zI2qdto0RtrXJn4q2Iqm OlangzTIWpkUK5oRNbATAnju3bBRNxAVurWwXsnBwLJ9ylxky+V/qoheeoc6RThKZWVjs5 zNaOVHB6VL5nAiX/ltc97dkMxnoCDD/iKRMI1E9L8evClPFV/L9Makz/2ntdR7NG5mEHJw GfiL/0iwBa/FFhGyWAunYUcfmVz/nkN4PS0kWfH6FnAPxkfvM5GdQ0pLm4udMh3eV15hIB 4fI0QcFqpLDlp1D/DRLG8HBStwUvgX9n0jkBfIU7zhtAebW1E9/zzrCx+FFSkg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737062779; a=rsa-sha256; cv=none; b=se56eB/N/+SYZMPVli6hKxkDi8qXVRrQqSmjzoZoZJbK3CwiT2CPTPtIhHQVYM80IS7Jgm 1NSVhBbl2QXTm6wO9xNKTovCv9/StiCDQnO1LefOZfVqrgDXI4iBIllp12SK/c2mZ8Eaks dYghUGA0QyszyFQbmpvlPHwbPQrWnS55D9dzXDEZkWJDpvyqplVV3ep30bkcb5A5yh9v/W oxvjFS4yJF7SnnpLDzxRVhJMCWSefxxL/eZXySO/Q189iM1CqwX4VG1o97sG3m/Y3p6WDf FcoJkuCjBJDtWUsii7wpSsS8mrhgBs+jrEwzyQ2xTjgBcM53PV6PjrSutSZtFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YYwsR1g2zzp3p; Thu, 16 Jan 2025 21:26:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50GLQJi0067771; Thu, 16 Jan 2025 21:26:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GLQJB1067768; Thu, 16 Jan 2025 21:26:19 GMT (envelope-from git) Date: Thu, 16 Jan 2025 21:26:19 GMT Message-Id: <202501162126.50GLQJB1067768@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 01efbf239baa - main - games/0ad: Fix build when HOSTTYPE is defined in the env List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01efbf239baaddf6a729627f7ee1709f61955efc Auto-Submitted: auto-generated The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=01efbf239baaddf6a729627f7ee1709f61955efc commit 01efbf239baaddf6a729627f7ee1709f61955efc Author: Guido Falsi AuthorDate: 2025-01-16 21:24:33 +0000 Commit: Guido Falsi 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