From nobody Thu Jan 16 21:26:58 2025 X-Original-To: dev-commits-ports-branches@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 4YYwtB6YZvz5kxFk; Thu, 16 Jan 2025 21:26:58 +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 4YYwtB5wwfz43CK; Thu, 16 Jan 2025 21:26:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737062818; 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=hTKYIsN29m3Q/VfC240GfiQ4IteI6LfQWNY5zPICZNM=; b=M40RYQiNQQy8tnwNzoItmIaDaRpY2KM3NGjB6iYDPx6l61Iv0oI/Whlk8bi0bcUtGDiJMs Tp6+0IZKAdm9Kks/b1rJGuis+ndm04ZOyCL7QHmso+YlBWBoMa+Q3DOS+afTLQWjNsUuVL lHVAoFS4ydU7LirT54xfgcHlNjko5SG0etPwGKImOguIJFe1seaKEmuAUj/e0TbaQ45BWb e6MeaVfvkGZO+XeA4qdIZygfYkIoLgVdbLIRfOmIMkXmy+pbp6Ydlz4qhaoXnzq62iPCpp d8rsU0bn+uHw5cdWZWugthcNUBSKB59TBkEgQfHXR4XCMOt+izraqnYXFCXiPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737062818; 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=hTKYIsN29m3Q/VfC240GfiQ4IteI6LfQWNY5zPICZNM=; b=UXPYL02HW3XAqfcbd2k/hgSZKhm5C0U+GzyN9NyzyEj6EgJglOcApsSMJXgvmXhCmdjyrz AmQ2xUtpTkD6trETYyaD/sWSK5wV/M6sFiS4RWAnTTzp1A9DJ3rsBtbvbEfxpZ0Y7s8a7m NDvL+C+qKaiegg93i4A43gP4gppDspABczXMfygF19fmIiv9o0GEdIOm4+e5DMbuxsM8NP ieUx68E9maa0is7gmRczmkA3bF36de4KsomJUNRqCgwDJi7+ZQfCDGeywW1o7dgkYz5eTp 1RAKEmRdZ24wVgQK/zO74IntRyxIshkreA3lYVQgfx+RrLt7fh+lDuLOq34HyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737062818; a=rsa-sha256; cv=none; b=kZsEap6ya408sxpcBTm7PtTr/8evvq15FN6DlDxxg227zePnySYx3vAxXDnG1N1vKHCvBE ZSwDFqQNoOsTI+AxuNR+Oe1Ogl0UxsxPCg3PA+TnK0g8VPaBXcwRqBPlQywCz+cKwku7Xj FchgQ/BmAVpXJnwQGwPZjeycUqLW0W6zkQL1H6wZ97PrmjzbhSLKTgPQG7G2hSdkXTg2hB kleMMliTrALHkhU43BMRn5KbNbGJuKU9kHx/ACly9uWRpeTXCuXNaST+nIMTKLlTVqq2+k dK0Wq3fMMdi9cwGWfokwD26TSx73OIntGCPef5FFfPxNn/vuxOI6NjxV1PZDTA== 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 4YYwtB5GtQzq8M; Thu, 16 Jan 2025 21:26:58 +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 50GLQwYU068136; Thu, 16 Jan 2025 21:26:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50GLQwF9068133; Thu, 16 Jan 2025 21:26:58 GMT (envelope-from git) Date: Thu, 16 Jan 2025 21:26:58 GMT Message-Id: <202501162126.50GLQwF9068133@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: 124607f55951 - 2025Q1 - games/0ad: Fix build when HOSTTYPE is defined in the env List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2025Q1 X-Git-Reftype: branch X-Git-Commit: 124607f559511427bb68ff74efd83c67e62f45e2 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=124607f559511427bb68ff74efd83c67e62f45e2 commit 124607f559511427bb68ff74efd83c67e62f45e2 Author: Guido Falsi AuthorDate: 2025-01-16 21:24:33 +0000 Commit: Guido Falsi CommitDate: 2025-01-16 21:26:45 +0000 games/0ad: Fix build when HOSTTYPE is defined in the env Reported by: dinoex (via IRC) Tested by: dinoex MFH: 2025Q1 (cherry picked from commit 01efbf239baaddf6a729627f7ee1709f61955efc) --- 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