From nobody Sat Nov 18 20:22:41 2023 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 4SXlZ94qgrz51Z4L; Sat, 18 Nov 2023 20:22:41 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SXlZ93xKdz4T4h; Sat, 18 Nov 2023 20:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700338961; 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=tLIXxxXKGwNxc3wNLod0TeBeUqgQW+3WRdHfDVbedoU=; b=o7NFAQHVby25gVitx0eubTMF2o7a7uGYh3DCrr/2AF3LMc8AkKnlXeqUhTXTAMaiV2QhrO 7dibHPWjcwsDjrVJSUkSJOM2Ehaf8L06QVTLykYODvn7zyxAqUmoufNqQ97wCJtN3wXVqo riHmc2gl3AMdgGSeF2MMS+SMAmsx7mXATiit84INPR3479BCmzZJDfuU5q3PBXPPd4+x3U Emb6be3HQGBSCGpqRIaQMJgn97qivSx5mmz59dwzUjEWhulQ129zR/+Yg7TCn2NMXKR72M W9g0YGz7Kz+ChfoQsv2zknikPt1fjeHKqbDKZvOPqWRzp27CXttk9XKtW0B0zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700338961; 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=tLIXxxXKGwNxc3wNLod0TeBeUqgQW+3WRdHfDVbedoU=; b=lCuhb6cnrpqT8hbqli0B3H3hRUPo/zROfLjY8Y+9otaZ003GmpXrvEOR7mFaEGgdlPXQnk mYAMw9yAxM2Y1Ga/qPcSyrp8IRSOb5+u7gIb6HvNkIZLPjnpjkIJXO9fzrVapWXUeT/11K f+QUsB211xosTj0ZmGkowt14og+njZjF9ZuzrQ+Mujq032d1+ptHloNjhNCm2l+ftbcx39 KCGpBanzHlVvK//r6QLJdIbv5h7MtafJ3ptv5ZtERtrtrN2b2Coa5/gP0doYTCWUzRihtB Y2yom6FvhbIOUVmdPckNjvU28xtXE9WKozl+etRDUplO4voWq01N7+sgpiDD5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700338961; a=rsa-sha256; cv=none; b=DsaEVDb4zFyiYM2o83cAgWGrKwTFQR5DH1vC35lqqwjncYkhoanx9LvJ9bn9I6ZTJOxVk6 w6rcOk6oFzCqH2rRmf+JVEgD6qfR7YXnkQUWiZpP84BkLxw0XZPAsJwrIaYsSFS7Ey5aJU soq/a65Bh+UNmvYccCF55Ks0zPd4zKgaX5STjRnz3QuYrac5Ve05xr0nWdBh614fChoSBh qZLYNnwMEOqDT4ImJDDL0CiAxbwITMscwavJy6KVJ668OMgSqWNWjUs39PJaF5Dp8q95Dw mmnze+aYWZHpilWuQAqTDt62LTXdU7qYS/SfKc4QSlK4D2nXKrRzglrMyXjtLQ== 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 4SXlZ92tCWzgJv; Sat, 18 Nov 2023 20:22:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AIKMfxF015366; Sat, 18 Nov 2023 20:22:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AIKMfAu015363; Sat, 18 Nov 2023 20:22:41 GMT (envelope-from git) Date: Sat, 18 Nov 2023 20:22:41 GMT Message-Id: <202311182022.3AIKMfAu015363@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: e3aeb5c7a93b - main - games/jaggedalliance2: extend 14.0+ build fix to all architectures 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3aeb5c7a93b7b9b6df753648e0669143476916d Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3aeb5c7a93b7b9b6df753648e0669143476916d commit e3aeb5c7a93b7b9b6df753648e0669143476916d Author: Robert Clausecker AuthorDate: 2023-11-16 20:53:33 +0000 Commit: Robert Clausecker CommitDate: 2023-11-18 20:20:41 +0000 games/jaggedalliance2: extend 14.0+ build fix to all architectures The fix seems to be needed on amd64 too, so apply it to all architectures just in case. Reported by: Martin Neubauer Approved by: portmgr (build fix blanket) PR: 275069, 274601 MFH: 2023Q4 --- games/jaggedalliance2/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile index b9dd9fbefe59..751b924345e5 100644 --- a/games/jaggedalliance2/Makefile +++ b/games/jaggedalliance2/Makefile @@ -159,6 +159,12 @@ CARGO_TEST= no MAKE_ENV= ${CARGO_ENV:NCARGO_TARGET_DIR=*} LDFLAGS+= -Wl,--as-needed +.include + +.if ${OSVERSION} >= 1400000 +CXXFLAGS+= -Wno-error=enum-constexpr-conversion +.endif + pre-patch: @${REINPLACE_CMD} -e 's|https://github.com/Neargye/magic_enum/archive/v0.7.3.zip|${DISTDIR}/Neargye-magic_enum-v0.7.3_GH0.tar.gz|' \ -e 's|86338841251da1bacab82684a76c4042|fc20f4149a6d6a2caa8ff66f99dac7cf|' \ @@ -174,10 +180,4 @@ post-install: ${STAGEDIR}${PREFIX}/bin/ja2-launcher \ ${STAGEDIR}${PREFIX}/bin/ja2-resource-pack -.include - -.if ${OSVERSION} >= 1400000 && ${ARCH} == "i386" -CXXFLAGS+= -Wno-error=enum-constexpr-conversion -.endif - .include