CVS commit: [pkgsrc-2020Q1] pkgsrc/emulators/libretro-bsnes-mercury

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Wed Jun 17 11:46:56 UTC 2020

Modified Files:
        pkgsrc/emulators/libretro-bsnes-mercury [pkgsrc-2020Q1]:
            Makefile.common

Log Message:
Pullup ticket #6237 - requested by nia
emulators/libretro-bsnes-mercury: NetBSD/arm build fix

Revisions pulled up:
- emulators/libretro-bsnes-mercury/Makefile.common              1.7

---
   Module Name: pkgsrc
   Committed By:        nia
   Date:                Sat Jun 13 10:01:06 UTC 2020

   Modified Files:
        pkgsrc/emulators/libretro-bsnes-mercury: Makefile.common

   Log Message:
   libretro-bsnes-mercury: Uncondition HAVE_POSIX_MEMALIGN so it works on 32-bit arm


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.6.1 \
    pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common

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.4 pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common:1.4.6.1
--- pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common:1.4 Sat May 18 09:42:03 2019
+++ pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common     Wed Jun 17 11:46:56 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2019/05/18 09:42:03 nia Exp $
+# $NetBSD: Makefile.common,v 1.4.6.1 2020/06/17 11:46:56 bsiegert Exp $
 #
 # used by emulators/libretro-bsnes-mercury/Makefile
 # used by emulators/libretro-bsnes-mercury-accuracy/Makefile
@@ -37,10 +37,8 @@ do-install:
 
 .include "../../mk/bsd.fast.prefs.mk"
 
-# Needed in libco/aarch64.c
-.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "aarch64eb"
-CFLAGS+=       -DHAVE_POSIX_MEMALIGN=1
-.endif
+# libco/aarch64.c and libco/armeabi.c try to use memalign() otherwise,
+CFLAGS.NetBSD+=                -DHAVE_POSIX_MEMALIGN=1
 
 .include "../../mk/dlopen.buildlink3.mk"
 BUILDLINK_TRANSFORM+=  opt:-ldl:${BUILDLINK_LDADD.dl:Q}