From nobody Sat Nov 18 20:24:58 2023 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 4SXlcq2yBHz51Zqf; Sat, 18 Nov 2023 20:24:59 +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 4SXlcp4h23z4Vm0; Sat, 18 Nov 2023 20:24:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700339098; 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=+LylKEYPv7t2k2VDDcCZH/OYL1x5k7NVQpdD1JZAFTg=; b=OJA0yCtQPTU1LXVu8Z2shxIVF4xm7qYruwbm+07u1vVi4oPAyuIj+lay9qVix2gEhM1J+p RhzQ03xTnPe50qXGu8kMvk4vsJbv9Wxlzvr9Cik8GdgqoV1kr4fAVCIpkkuyEVXehT30yh 1ofF4/z0/IOELbMlIbYsXmOQVnxlgKlQfpe8ppuJn2a/jhkWp9wFSvY1304MTH9nKtchJO lfCH3fGPvOHrbLgUcyk8zZjNUkbMth27IzHZSPZ6PwP7pSDK6lLVEPAgJtniQMT4BoEH4f CocCQr7WttU3UtWmvYKAACcnckwMvdcw9uMJrsb7xpZDHrlDifG+oKxmAiaURw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700339098; 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=+LylKEYPv7t2k2VDDcCZH/OYL1x5k7NVQpdD1JZAFTg=; b=usO/LaYfxx6bbhe5byF3Y0oTuoFmIu8vMeoNmxswZzgJAhGGBw47Nhs6WIrBriuXCPDChK i+SYO+kC4xBjkNW26dp1jQEhmuMcSJQgtfAHfsJXKJQ+TzFe4la+yk//KPm1GBZo2trQgB Ko5QblxxfV9WCeLNNxZKIxvVFLcQj+wkwGyO6pAR9mz0TBCCDp30W6n43lfa6C6Q3954wG Q0HUv6IWTj8ujH1sXNFgh+VOg0/7CMnGoIsOTB2toTeWB7SDcDlXIwlIHduvbnZfMxk10k an3H3GLYJvbmkcb90ClJUB+/CjGbWZD0rHzBaCWc47/YspDcIUdnIdr6I3xHxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700339098; a=rsa-sha256; cv=none; b=jxpZUYwMlHaFHo+PKyDApGJP2k4zSzFR4Bq1SSEfT05PQAA6V4Ns88rkUxtoWBHihqzzJ4 p0QIzE4zvz2oEVxezejX1jENL9S8mVQQ0WpaSupTsIajWfS/l4Sdsg5at8AG0ViF0ef3mI 46gSiqP/DwSFqCYgNqOYDkIxYB+KmTdUKuoCE2BamtK5fkPJmyyxpmpoW7wq5tUOAndQul ZXchGLOv81oH0Z4w7PnIPXQH22SU9NENRbXsJI3hlmZL98FV2bUSmHrN0fhPXfeN/CQDe3 vfKB9rObKRnAkPOZY5Z8za6EvZlNyRh6A1dDDT29VYGt8Zf+A2gdYtIf0t6/6w== 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 4SXlcp3kHqzh95; Sat, 18 Nov 2023 20:24:58 +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 3AIKOwhL017049; Sat, 18 Nov 2023 20:24:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AIKOww7017046; Sat, 18 Nov 2023 20:24:58 GMT (envelope-from git) Date: Sat, 18 Nov 2023 20:24:58 GMT Message-Id: <202311182024.3AIKOww7017046@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Robert Clausecker Subject: git: 481fc59a5fde - 2023Q4 - games/jaggedalliance2: extend 14.0+ build fix to all architectures 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: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 481fc59a5fde8489b9a9583144b24204d255b2fb Auto-Submitted: auto-generated The branch 2023Q4 has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=481fc59a5fde8489b9a9583144b24204d255b2fb commit 481fc59a5fde8489b9a9583144b24204d255b2fb Author: Robert Clausecker AuthorDate: 2023-11-16 20:53:33 +0000 Commit: Robert Clausecker CommitDate: 2023-11-18 20:24:40 +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 (cherry picked from commit e3aeb5c7a93b7b9b6df753648e0669143476916d) --- games/jaggedalliance2/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/games/jaggedalliance2/Makefile b/games/jaggedalliance2/Makefile index c0d021a4616f..9ec1ef3c231b 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