CVS commit: pkgsrc/emulators

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 28 13:30:29 UTC 2020

Modified Files:
        pkgsrc/emulators/libretro-bsnes-mercury: Makefile.common
        pkgsrc/emulators/libretro-flycast: Makefile
        pkgsrc/emulators/retroarch: core.mk

Log Message:
retroarch: Centralise definition of HAVE_POSIX_MEMALIGN


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/libretro-flycast/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/emulators/retroarch/core.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common
diff -u pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common:1.7 pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common:1.8
--- pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common:1.7 Sat Jun 13 10:01:06 2020
+++ pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common     Sun Jun 28 13:30:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2020/06/13 10:01:06 nia Exp $
+# $NetBSD: Makefile.common,v 1.8 2020/06/28 13:30:29 nia Exp $
 #
 # used by emulators/libretro-bsnes-mercury/Makefile
 # used by emulators/libretro-bsnes-mercury-accuracy/Makefile
@@ -26,9 +26,6 @@ PATCHDIR=     ${.CURDIR}/../../emulators/lib
 
 .include "../../mk/bsd.prefs.mk"
 
-# libco/aarch64.c and libco/armeabi.c try to use memalign() otherwise,
-CFLAGS.NetBSD+=                -DHAVE_POSIX_MEMALIGN=1
-
 LIBRETRO_CORE= bsnes_mercury_${BSNES_PROFILE}
 
 .include "../../emulators/retroarch/core.mk"

Index: pkgsrc/emulators/libretro-flycast/Makefile
diff -u pkgsrc/emulators/libretro-flycast/Makefile:1.3 pkgsrc/emulators/libretro-flycast/Makefile:1.4
--- pkgsrc/emulators/libretro-flycast/Makefile:1.3      Sun May 31 17:38:15 2020
+++ pkgsrc/emulators/libretro-flycast/Makefile  Sun Jun 28 13:30:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/05/31 17:38:15 nia Exp $
+# $NetBSD: Makefile,v 1.4 2020/06/28 13:30:29 nia Exp $
 
 DISTNAME=      libretro-flycast-20200529
 CATEGORIES=    emulators
@@ -27,9 +27,6 @@ CFLAGS+=      -DLOW_END
 CXXFLAGS+=     -DLOW_END
 .endif
 
-CFLAGS+=       -DHAVE_POSIX_MEMALIGN=1
-CXXFLAGS+=     -DHAVE_POSIX_MEMALIGN=1
-
 .if ${MACHINE_ARCH} == "aarch64"
 MAKE_FLAGS+=   WITH_DYNAREC=arm64
 MAKE_FLAGS+=   HAVE_GENERIC_JIT=0

Index: pkgsrc/emulators/retroarch/core.mk
diff -u pkgsrc/emulators/retroarch/core.mk:1.4 pkgsrc/emulators/retroarch/core.mk:1.5
--- pkgsrc/emulators/retroarch/core.mk:1.4      Thu Jun 25 15:22:50 2020
+++ pkgsrc/emulators/retroarch/core.mk  Sun Jun 28 13:30:29 2020
@@ -1,4 +1,4 @@
-# $NetBSD: core.mk,v 1.4 2020/06/25 15:22:50 nia Exp $
+# $NetBSD: core.mk,v 1.5 2020/06/28 13:30:29 nia Exp $
 
 MASTER_SITES?= ${MASTER_SITE_GITHUB:=libretro/}
 
@@ -32,6 +32,9 @@ CFLAGS+=      -DBYTE_ORDER=BIG_ENDIAN
 CFLAGS+=       -DWORDS_BIGENDIAN -DMSB_FIRST
 .endif
 
+# Avoid using memalign() in libco on NetBSD.
+CFLAGS.NetBSD+=        -DHAVE_POSIX_MEMALIGN=1
+
 BUILDLINK_TRANSFORM.SunOS+=    rm:-Wl,--no-undefined
 
 INSTALLATION_DIRS+=    lib/libretro