pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: emulators/fbneo: fix building on aarch64 netbsd



On Tue, 11 Feb 2025, adr wrote:
By the way, libretro-fbneo's Makefile has

.elif ${MACHINE_ARCH} == "aarch64"
MAKE_FLAGS+=    ENDIANNESS_DEFINES=-DLSB_FIRST aarch64

but the patch of burn_endian.h should include

---------------------
-// Xbox 360 has byteswap 64-bit intrinsic
-#ifndef _XBOX
+// Xbox 360 and NetBSD have byteswap 64-bit intrinsic
+#if !definded(_XBOX) && !defined(__NetBSD__)
---------------------

Sorry about that, libretro-fbneo it's based in a more recent code,
the file has been rearranged to avoid the bug in emulators/fbneo,
so this is not necessary.

I attached a patch to follow Martin advise to use mk/endian.mk here
too.

Regards.
adr

================================
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/libretro-fbneo/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	29 May 2023 14:33:14 -0000	1.4
+++ Makefile	11 Feb 2025 14:24:58 -0000
@@ -27,13 +27,12 @@

 .if ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf"
 MAKE_FLAGS+=	USE_CYCLONE=1
-MAKE_FLAGS+=	ENDIANNESS_DEFINES=-DLSB_FIRST
-.elif ${MACHINE_ARCH} == "aarch64"
-MAKE_FLAGS+=	ENDIANNESS_DEFINES=-DLSB_FIRST
 .elif ${MACHINE_ARCH} == "x86_64"
 MAKE_FLAGS+=	USE_X64_DRC=1
-MAKE_FLAGS+=	ENDIANNESS_DEFINES=-DLSB_FIRST
-.elif ${MACHINE_ARCH} == "i386"
+.endif
+
+.include "../../mk/endian.mk"
+.if ${MACHINE_ENDIAN} == "little"
 MAKE_FLAGS+=	ENDIANNESS_DEFINES=-DLSB_FIRST
 .endif
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/libretro-fbneo/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	29 May 2023 14:33:14 -0000	1.4
+++ Makefile	11 Feb 2025 14:24:58 -0000
@@ -27,13 +27,12 @@
 
 .if ${MACHINE_ARCH} == "earmv6hf" || ${MACHINE_ARCH} == "earmv7hf"
 MAKE_FLAGS+=	USE_CYCLONE=1
-MAKE_FLAGS+=	ENDIANNESS_DEFINES=-DLSB_FIRST
-.elif ${MACHINE_ARCH} == "aarch64"
-MAKE_FLAGS+=	ENDIANNESS_DEFINES=-DLSB_FIRST
 .elif ${MACHINE_ARCH} == "x86_64"
 MAKE_FLAGS+=	USE_X64_DRC=1
-MAKE_FLAGS+=	ENDIANNESS_DEFINES=-DLSB_FIRST
-.elif ${MACHINE_ARCH} == "i386"
+.endif
+
+.include "../../mk/endian.mk"
+.if ${MACHINE_ENDIAN} == "little"
 MAKE_FLAGS+=	ENDIANNESS_DEFINES=-DLSB_FIRST
 .endif
 


Home | Main Index | Thread Index | Old Index