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, Martin Husemann wrote:
 How about splitting that into separate tests?
 [...]
 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "little"
 MAKE_FLAGS+=    LSB_FIRST=1
 .endif

I attached patches following your suggestion.

=======================
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/fbneo/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- Makefile	22 Dec 2024 12:16:45 -0000	1.4
+++ Makefile	11 Feb 2025 14:04:47 -0000
@@ -32,10 +32,14 @@
 .include "../../mk/bsd.prefs.mk"

 .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
-MAKE_FLAGS+=	LSB_FIRST=1
 TOOL_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 .endif

+.include "../../mk/endian.mk"
+.if ${MACHINE_ENDIAN} == "little"
+MAKE_FLAGS+=	LSB_FIRST=1
+.endif
+
 LDFLAGS+=	-lpng -lz

 MAKE_JOBS_SAFE=	no
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/fbneo/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo	29 May 2023 19:30:47 -0000	1.1
+++ distinfo	11 Feb 2025 14:04:47 -0000
@@ -5,5 +5,5 @@
 Size (FBNeo-1.0.0.2.tar.gz) = 12171430 bytes
 SHA1 (patch-makefile) = 94c77fe8b5c8f7b924c507d7b327f9ef25bb3409
 SHA1 (patch-makefile.sdl2) = a41b13f31faccf2e6bb075290f926fb64ca7b1d5
-SHA1 (patch-src_burn_burnint.h) = 1050d2088c17b0763c47fef6a0674b5eb94b7ba6
+SHA1 (patch-src_burn_burnint.h) = eb63708ff70aa8274b8eb6601aa62aa94ea640e6
 SHA1 (patch-src_burner_burner.h) = a09ded507381d6f2bb9d4476813122a53415c01d
Index: patches/patch-src_burn_burnint.h
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/fbneo/patches/patch-src_burn_burnint.h,v
retrieving revision 1.1
diff -u -r1.1 patch-src_burn_burnint.h
--- patches/patch-src_burn_burnint.h	29 May 2023 19:30:48 -0000	1.1
+++ patches/patch-src_burn_burnint.h	11 Feb 2025 14:04:47 -0000
@@ -4,6 +4,17 @@

 --- src/burn/burnint.h.orig	2021-05-01 20:32:23.000000000 +0000
 +++ src/burn/burnint.h
+@@ -30,8 +30,8 @@ typedef union
+ #define BURN_ENDIAN_SWAP_INT64(x)				x
+ #else
+ +-// Xbox 360 has byteswap 64-bit intrinsic
+-#ifndef _XBOX
++// Xbox 360 and NetBSD have byteswap 64-bit intrinsic
++#if !definded(_XBOX) && !defined(__NetBSD__)
+ #define NO_64BIT_BYTESWAP
+ #endif
+
 @@ -80,6 +80,13 @@ typedef union {
  #define BURN_ENDIAN_SWAP_INT8(x)				(x^1)
  #define BURN_ENDIAN_SWAP_INT16(x)				({uint16_t tt; __sthbrx(&tt, 0, x); tt;})


Home | Main Index | Thread Index | Old Index