[pkgsrc/trunk]: pkgsrc For USE_MMX users, do the following:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/45d8e6e61b73
branches:  trunk
changeset: 477930:45d8e6e61b73
user:      cube <cube%pkgsrc.org@localhost>
date:      Mon Jul 12 19:27:05 2004 +0000

description:
For USE_MMX users, do the following:
o only include it in the BUILD_DEFS if the current platform is concerned.
  For now that only includes i386, but we might find amd64 users in the
  future.
o test against [Yy][Ee][Ss], for consistency.

Fixes part of PR 26243.

diffstat:

 devel/libast/Makefile      |  8 +++++---
 emulators/snes9x/Makefile  |  4 ++--
 graphics/imlib2/Makefile   |  8 +++++---
 multimedia/ffmpeg/Makefile |  9 ++++-----
 x11/eterm/Makefile         |  6 ++++--
 5 files changed, 20 insertions(+), 15 deletions(-)

diffs (113 lines):

diff -r 9e49cca20ace -r 45d8e6e61b73 devel/libast/Makefile
--- a/devel/libast/Makefile     Mon Jul 12 19:08:03 2004 +0000
+++ b/devel/libast/Makefile     Mon Jul 12 19:27:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:37 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/07/12 19:27:05 cube Exp $
 
 DISTNAME=              libast-0.5
 PKGREVISION=           6
@@ -16,10 +16,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386" && ${USE_MMX} != "NO"
+.if ${MACHINE_ARCH} == "i386"
+BUILD_DEFS+=           USE_MMX
+. if !empty(USE_MMX:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=       --enable-mmx
+. endif
 .endif
-BUILD_DEFS+=           USE_MMX
 
 .if ${OPSYS} == "SunOS"
 LDFLAGS+=-lresolv
diff -r 9e49cca20ace -r 45d8e6e61b73 emulators/snes9x/Makefile
--- a/emulators/snes9x/Makefile Mon Jul 12 19:08:03 2004 +0000
+++ b/emulators/snes9x/Makefile Mon Jul 12 19:27:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/04/11 17:02:59 snj Exp $
+# $NetBSD: Makefile,v 1.20 2004/07/12 19:27:05 cube Exp $
 
 DISTNAME=              s9xs139
 PKGNAME=               snes9x-1.39
@@ -45,7 +45,7 @@
 MAKE_ENV+=     ZSNESFX=1
 MAKE_ENV+=     ZSNESC4=1
 MAKE_ENV+=     ASMCPU=1
-.if ${USE_MMX} != "NO"
+.if !empty(USE_MMX:M[Yy][Ee][Ss])
 MAKE_ENV+=     ASMKREED=1
 .endif
 BUILD_DEFS+=   USE_MMX
diff -r 9e49cca20ace -r 45d8e6e61b73 graphics/imlib2/Makefile
--- a/graphics/imlib2/Makefile  Mon Jul 12 19:08:03 2004 +0000
+++ b/graphics/imlib2/Makefile  Mon Jul 12 19:27:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/14 18:26:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/07/12 19:27:05 cube Exp $
 #
 
 DISTNAME=              imlib2-1.1.0
@@ -21,10 +21,12 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${MACHINE_ARCH} == "i386" && ${USE_MMX} != "NO"
+.if ${MACHINE_ARCH} == "i386"
+BUILD_DEFS+=           USE_MMX
+. if !empty(USE_MMX:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=       --enable-mmx
+. endif
 .endif
-BUILD_DEFS+=           USE_MMX
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff -r 9e49cca20ace -r 45d8e6e61b73 multimedia/ffmpeg/Makefile
--- a/multimedia/ffmpeg/Makefile        Mon Jul 12 19:08:03 2004 +0000
+++ b/multimedia/ffmpeg/Makefile        Mon Jul 12 19:27:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/06/20 02:36:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/12 19:27:05 cube Exp $
 
 DISTNAME=      ffmpeg-0.4.8
 PKGREVISION=   1
@@ -25,12 +25,11 @@
 CONFIGURE_ARGS=                --cc=${CC} --disable-grab --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --enable-pp --disable-vhook --disable-debug
 
-BUILD_DEFS+=           USE_MMX
-
 .include "../../mk/compiler.mk"
 
-.if !empty(MACHINE_ARCH:Mi386) && !empty(USE_MMX:M[Yy][Ee][Ss])
-.  if !empty(CC_VERSION:Mgcc*)
+.if !empty(MACHINE_ARCH:Mi386)
+BUILD_DEFS+=           USE_MMX
+.  if !empty(USE_MMX:M[Yy][Ee][Ss]) && !empty(CC_VERSION:Mgcc*)
 CFLAGS+=       -fomit-frame-pointer
 .  endif
 .else
diff -r 9e49cca20ace -r 45d8e6e61b73 x11/eterm/Makefile
--- a/x11/eterm/Makefile        Mon Jul 12 19:08:03 2004 +0000
+++ b/x11/eterm/Makefile        Mon Jul 12 19:27:05 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/07/12 19:08:03 cube Exp $
+# $NetBSD: Makefile,v 1.34 2004/07/12 19:27:05 cube Exp $
 #
 
 DISTNAME=              Eterm-0.9.2
@@ -45,9 +45,11 @@
 SPECIAL_PERMS=         ${PREFIX}/bin/Eterm ${SETUID_ROOT_PERMS}
 .endif
 
+.if ${MACHINE_ARCH} == "i386"
 BUILD_DEFS+=           USE_MMX
-.if ${MACHINE_ARCH} == "i386" && !empty(USE_MMX:M[Yy][Ee][Ss])
+. if !empty(USE_MMX:M[Yy][Ee][Ss])
 CONFIGURE_ARGS+=       --enable-mmx
+. endif
 .endif
 
 post-extract: