git: e3aeb5c7a93b - main - games/jaggedalliance2: extend 14.0+ build fix to all architectures
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 18 Nov 2023 20:22:41 UTC
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e3aeb5c7a93b7b9b6df753648e0669143476916d commit e3aeb5c7a93b7b9b6df753648e0669143476916d Author: Robert Clausecker <fuz@FreeBSD.org> AuthorDate: 2023-11-16 20:53:33 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> 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 <m.ne@gmx.net> 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 <bsd.port.pre.mk> + +.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 <bsd.port.pre.mk> - -.if ${OSVERSION} >= 1400000 && ${ARCH} == "i386" -CXXFLAGS+= -Wno-error=enum-constexpr-conversion -.endif - .include <bsd.port.post.mk>