[pkgsrc/trunk]: pkgsrc/emulators Since options are ARM-specific, but options ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/140cb68c26f4
branches:  trunk
changeset: 646232:140cb68c26f4
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Feb 05 17:17:11 2015 +0000

description:
Since options are ARM-specific, but options framework insists on having
at least one option, include options.mk only on ARM.

diffstat:

 emulators/libretro-mupen64plus/Makefile  |  10 +++++++---
 emulators/libretro-pcsx-rearmed/Makefile |  13 ++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r 4585ab8956a1 -r 140cb68c26f4 emulators/libretro-mupen64plus/Makefile
--- a/emulators/libretro-mupen64plus/Makefile   Thu Feb 05 17:15:52 2015 +0000
+++ b/emulators/libretro-mupen64plus/Makefile   Thu Feb 05 17:17:11 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/02/05 16:57:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2015/02/05 17:17:11 wiz Exp $
 
 DISTNAME=      mupen64plus-libretro-20150204
 PKGNAME=       libretro-mupen64plus-20150204
@@ -29,10 +29,14 @@
 CFLAGS+=       -DHAVE_POSIX_MEMALIGN=1
 .endif
 
+.if !empty(MACHINE_ARCH:M*arm*)
+# only ARM-specific options for now, and options framework
+#insists on having at least one option, so only pull it in for ARM
+.include "options.mk"
+.endif
+
 do-install:
        ${INSTALL_LIB} ${WRKSRC}/mupen64plus_libretro.so \
            ${DESTDIR}${PREFIX}/lib/libretro/mupen64plus_libretro.so
 
-.include "options.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff -r 4585ab8956a1 -r 140cb68c26f4 emulators/libretro-pcsx-rearmed/Makefile
--- a/emulators/libretro-pcsx-rearmed/Makefile  Thu Feb 05 17:15:52 2015 +0000
+++ b/emulators/libretro-pcsx-rearmed/Makefile  Thu Feb 05 17:17:11 2015 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/02/05 16:57:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2015/02/05 17:17:11 wiz Exp $
 
 DISTNAME=      pcsx-rearmed-libretro-20150204
 PKGNAME=       libretro-pcsx-rearmed-20150204
@@ -21,17 +21,24 @@
 INSTALLATION_DIRS+=    ${PREFIX}/lib/libretro
 
 BUILDLINK_TRANSFORM+=  rm:-ldl
+
+.include "../../mk/bsd.prefs.mk"
+
 .if !empty(MACHINE_ARCH:M*arm*hf)
 CFLAGS+=       -mfloat-abi=hard
 ASFLAGS+=      -mfloat-abi=hard
 .endif
 
+.if !empty(MACHINE_ARCH:M*arm*)
+# only ARM-specific options for now, and options framework
+#insists on having at least one option, so only pull it in for ARM
+.include "options.mk"
+.endif
+
 do-install:
        ${INSTALL_LIB} ${WRKSRC}/libretro.so \
            ${DESTDIR}${PREFIX}/lib/libretro/pcsx_rearmed_libretro.so
 
-.include "options.mk"
-
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"