git: 14f010cce83d - main - emulators/visualboyadvance-m: fix build on non-x86
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 26 Oct 2021 09:31:26 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=14f010cce83d1ab012d1fbb1c77b1f22d434a062
commit 14f010cce83d1ab012d1fbb1c77b1f22d434a062
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2021-10-26 09:28:45 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2021-10-26 09:28:45 +0000
emulators/visualboyadvance-m: fix build on non-x86
/wrkdirs/usr/ports/emulators/visualboyadvance-m/work/visualboyadvance-m-VBA-M_Beta_2/src/gba/GBA-thumb.cpp:40:8: error: 'regparm' is not valid on this platform
static INSN_REGPARM void thumbUnknownInsn(u32 opcode)
---
emulators/visualboyadvance-m/Makefile | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/emulators/visualboyadvance-m/Makefile b/emulators/visualboyadvance-m/Makefile
index acc685bf90b5..7caca7e864d4 100644
--- a/emulators/visualboyadvance-m/Makefile
+++ b/emulators/visualboyadvance-m/Makefile
@@ -11,13 +11,9 @@ COMMENT= Game Boy Advance emulator with GTK frontend
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/doc/gpl.txt
-BROKEN_aarch64= fails to build: regparm is not valid on this platform
-BROKEN_armv6= fails to build: regparm is not valid on this platform
-BROKEN_armv7= fails to build: regparm is not valid on this platform
-
LIB_DEPENDS= libpng.so:graphics/png
-USES= cmake:insource,noninja compiler:c++11-lang dos2unix gl gnome \
+USES= cmake:insource,noninja dos2unix gl gnome \
pkgconfig sdl xorg
DOS2UNIX_REGEX= .*\.(c|cpp|h|ypp)
USE_XORG= x11 xext
@@ -78,6 +74,14 @@ LIRC_LIB_DEPENDS= liblirc_client.so:comms/lirc
LIRC_RUN_DEPENDS= lircd:comms/lirc
LIRC_CMAKE_BOOL= ENABLE_LIRC
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != amd64 && ${ARCH} != i386
+USES+= compiler:gcc-c++11-lib
+.else
+USES+= compiler:c++11-lang
+.endif
+
post-patch:
@${REINPLACE_CMD} -e '/SET.*LIRC_CLIENT_LIBRARY/ s|lirc_client|${LOCALBASE}/lib/lib&.so|; \
s|share/man|man|' ${WRKSRC}/CMakeLists.txt