Wed Jun 17 11:46:56 2020 UTC ()
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


(bsiegert)
diff -r1.4 -r1.4.6.1 pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common
cvs diff -r1.4 -r1.4.6.1 pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common 2019/05/18 09:42:03 1.4
+++ pkgsrc/emulators/libretro-bsnes-mercury/Makefile.common 2020/06/17 11:46:56 1.4.6.1
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.4 2019/05/18 09:42:03 nia Exp $ 1# $NetBSD: Makefile.common,v 1.4.6.1 2020/06/17 11:46:56 bsiegert Exp $
2# 2#
3# used by emulators/libretro-bsnes-mercury/Makefile 3# used by emulators/libretro-bsnes-mercury/Makefile
4# used by emulators/libretro-bsnes-mercury-accuracy/Makefile 4# used by emulators/libretro-bsnes-mercury-accuracy/Makefile
5# used by emulators/libretro-bsnes-mercury-performance/Makefile 5# used by emulators/libretro-bsnes-mercury-performance/Makefile
6 6
7DISTNAME= libretro-bsnes-mercury-20180803 7DISTNAME= libretro-bsnes-mercury-20180803
8PKGNAME= ${DISTNAME:S/libretro-bsnes-mercury/libretro-bsnes-mercury-${BSNES_PROFILE}/} 8PKGNAME= ${DISTNAME:S/libretro-bsnes-mercury/libretro-bsnes-mercury-${BSNES_PROFILE}/}
9CATEGORIES= emulators 9CATEGORIES= emulators
10MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=libretro/}
11GITHUB_PROJECT= bsnes-mercury 11GITHUB_PROJECT= bsnes-mercury
12GITHUB_TAG= 4e221df676ffc7b46d083cf2ae100131eabe5076 12GITHUB_TAG= 4e221df676ffc7b46d083cf2ae100131eabe5076
13 13
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
@@ -27,20 +27,18 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--no- @@ -27,20 +27,18 @@ BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--no-
27BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=target-libretro/link.T 27BUILDLINK_TRANSFORM.SunOS+= rm:-Wl,--version-script=target-libretro/link.T
28 28
29INSTALLATION_DIRS+= ${PREFIX}/lib/libretro 29INSTALLATION_DIRS+= ${PREFIX}/lib/libretro
30 30
31DISTINFO_FILE= ${.CURDIR}/../../emulators/libretro-bsnes-mercury/distinfo 31DISTINFO_FILE= ${.CURDIR}/../../emulators/libretro-bsnes-mercury/distinfo
32PATCHDIR= ${.CURDIR}/../../emulators/libretro-bsnes-mercury/patches 32PATCHDIR= ${.CURDIR}/../../emulators/libretro-bsnes-mercury/patches
33 33
34do-install: 34do-install:
35 ${INSTALL_LIB} ${WRKSRC}/out/bsnes_mercury_${BSNES_PROFILE}_libretro.so \ 35 ${INSTALL_LIB} ${WRKSRC}/out/bsnes_mercury_${BSNES_PROFILE}_libretro.so \
36 ${DESTDIR}${PREFIX}/lib/libretro/bsnes_mercury_${BSNES_PROFILE}_libretro.so 36 ${DESTDIR}${PREFIX}/lib/libretro/bsnes_mercury_${BSNES_PROFILE}_libretro.so
37 37
38.include "../../mk/bsd.fast.prefs.mk" 38.include "../../mk/bsd.fast.prefs.mk"
39 39
40# Needed in libco/aarch64.c 40# libco/aarch64.c and libco/armeabi.c try to use memalign() otherwise,
41.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "aarch64eb" 41CFLAGS.NetBSD+= -DHAVE_POSIX_MEMALIGN=1
42CFLAGS+= -DHAVE_POSIX_MEMALIGN=1 
43.endif 
44 42
45.include "../../mk/dlopen.buildlink3.mk" 43.include "../../mk/dlopen.buildlink3.mk"
46BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q} 44BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:Q}