diff options
| author | wiz <wiz@pkgsrc.org> | 2005-06-10 18:20:06 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2005-06-10 18:20:06 +0000 |
| commit | 6ac47b68a4508af8cf50759845f87d49a881474c (patch) | |
| tree | acd5ab3ed46d538af8b4150088e0dd94d148c0ac | |
| parent | e4be7e4aa1f62958dcc5c00c35aeb5526455d116 (diff) | |
| download | pkgsrc-6ac47b68a4508af8cf50759845f87d49a881474c.tar.gz | |
Slightly different solution to previous:
just ignore mmx pkg_option if set on non-i386.
| -rw-r--r-- | emulators/snes9x/Makefile | 12 | ||||
| -rw-r--r-- | graphics/imlib2/options.mk | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile index 2d8e229869b..22bed2c942f 100644 --- a/emulators/snes9x/Makefile +++ b/emulators/snes9x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/06/10 18:09:45 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2005/06/10 18:20:06 wiz Exp $ DISTNAME= s9xs139 PKGNAME= snes9x-1.39 @@ -29,19 +29,17 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/README.TXT ${PREFIX}/share/doc/snes9x ${INSTALL_MAN} ${WRKSRC}/TODO.TXT ${PREFIX}/share/doc/snes9x -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_ARCH} == "i386" PKG_OPTIONS_VAR= PKG_OPTIONS.snes9x PKG_SUPPORTED_OPTIONS= mmx .include "../../mk/bsd.options.mk" -.endif + +.include "../../mk/bsd.prefs.mk" MAKE_ENV+= THREAD_SOUND=1 -.if ( ${MACHINE_ARCH} == "i386" ) +.if ${MACHINE_ARCH} == "i386" MAKE_ENV+= USING_I386=1 -.if ( ${OBJECT_FMT} == "a.out" ) +.if ${OBJECT_FMT} == "a.out" MAKE_ENV+= FILEFORMAT=aoutb MAKE_ENV+= _ASM_UNDERBARS=1 .else diff --git a/graphics/imlib2/options.mk b/graphics/imlib2/options.mk index 4326000a832..476b72f7f53 100644 --- a/graphics/imlib2/options.mk +++ b/graphics/imlib2/options.mk @@ -1,14 +1,13 @@ -# $NetBSD: options.mk,v 1.2 2005/06/10 18:14:23 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2005/06/10 18:21:45 wiz Exp $ -.include "../../mk/bsd.prefs.mk" - -.if ${MACHINE_ARCH} == "i386" PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2 PKG_SUPPORTED_OPTIONS= mmx .include "../../mk/bsd.options.mk" +.include "../../mk/bsd.prefs.mk" .if !empty(PKG_OPTIONS:Mmmx) +.if ${MACHINE_ARCH} == "i386" CONFIGURE_ARGS+= --enable-mmx .endif .endif |