[pkgsrc/pkgsrc-2020Q1]: pkgsrc/emulators/libretro-bsnes-mercury Pullup ticket...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bdf147f19ed3
branches:  pkgsrc-2020Q1
changeset: 434495:bdf147f19ed3
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Wed Jun 17 11:46:56 2020 +0000

description:
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

diffstat:

 emulators/libretro-bsnes-mercury/Makefile.common |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (22 lines):

diff -r 80d5fe2a82c1 -r bdf147f19ed3 emulators/libretro-bsnes-mercury/Makefile.common
--- a/emulators/libretro-bsnes-mercury/Makefile.common  Wed Jun 17 11:45:47 2020 +0000
+++ b/emulators/libretro-bsnes-mercury/Makefile.common  Wed Jun 17 11:46:56 2020 +0000
@@ -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 @@
 
 .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}