summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcube <cube@pkgsrc.org>2004-07-12 19:27:05 +0000
committercube <cube@pkgsrc.org>2004-07-12 19:27:05 +0000
commitd24b17b1058498eaff3ad92665bc6855034b4770 (patch)
tree1bdbb8477f81f6209af6e7a49a96a19f071561e4
parente364c6f686f30e9f9df2df876acc9fbdbb31999b (diff)
downloadpkgsrc-d24b17b1058498eaff3ad92665bc6855034b4770.tar.gz
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.
-rw-r--r--devel/libast/Makefile8
-rw-r--r--emulators/snes9x/Makefile4
-rw-r--r--graphics/imlib2/Makefile8
-rw-r--r--multimedia/ffmpeg/Makefile9
-rw-r--r--x11/eterm/Makefile6
5 files changed, 20 insertions, 15 deletions
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index ecc7ae398be..890db7e02d6 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -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 @@ TEST_TARGET= test
.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 --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index ba0bc1312c5..9fa2d338efe 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -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+= FILEFORMAT=elf
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 --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 307906b823b..12fee2e9ee5 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -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 @@ LIBS.SunOS= -lm
.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 --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 3e137115d49..b08c144de0f 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -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 @@ MAKE_ENV+= EXTRA_LIBS="${LIBGETOPT}" \
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 --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 90d5bcfe5e3..9189d77c354 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -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 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/themes
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: