git: a5c8bbb62740 - main - games/dxx-rebirth: fix build on 32-bits
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 21 Jan 2024 00:13:55 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=a5c8bbb62740b670a5c72867c66202db8d0064c8
commit a5c8bbb62740b670a5c72867c66202db8d0064c8
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2024-01-20 17:38:12 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2024-01-21 00:13:49 +0000
games/dxx-rebirth: fix build on 32-bits
common/include/serial.h:533:15: error: static assertion failed
533 | static_assert(check_bswap<uint64_t, 0x201000000000000ull, 0x102>);
---
games/dxx-rebirth/Makefile | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/games/dxx-rebirth/Makefile b/games/dxx-rebirth/Makefile
index 376e340ead2e..83e85923d919 100644
--- a/games/dxx-rebirth/Makefile
+++ b/games/dxx-rebirth/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= as:devel/binutils
LIB_DEPENDS= libphysfs.so:devel/physfs \
libpng.so:graphics/png
-USES= compiler:c++17-lang gl localbase:ldflags pkgconfig scons sdl \
- tar:xz
+USES= gl localbase:ldflags pkgconfig scons sdl tar:xz
USE_GL= gl glu
USE_GITHUB= yes
GH_TAGNAME= 4efe4c9
@@ -29,14 +28,19 @@ MAKE_ARGS= ignore_unknown_variables=1 sdl2=1
PLIST_FILES= bin/d1x-rebirth \
bin/d2x-rebirth
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if ${ARCH} != riscv64
MAKE_ARGS+= lto=1
.endif
+.if ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc
+CXXFLAGS+= -Wno-error=missing-field-initializers -Wno-error=maybe-uninitialized
+USES+= compiler:gcc-c++11-lib
+.endif
+
post-install:
${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/d1x-rebirth \
${STAGEDIR}${PREFIX}/bin/d2x-rebirth
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>