Since options are ARM-specific, but options framework insists on having

at least one option, include options.mk only on ARM.
This commit is contained in:
wiz 2015-02-05 17:17:11 +00:00
parent 60e7dbfcc4
commit 8573e5f81a
2 changed files with 17 additions and 6 deletions

View file

@ -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 @@ INSTALLATION_DIRS+= ${PREFIX}/lib/libretro
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"

View file

@ -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 @@ CONFIGURE_ARGS+=--platform=libretro
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"