Wed May 4 02:00:02 2011 UTC ()
exactly disable MMX/AMD64 optimization if pkg option is off.
part of PR#44931.


(obache)
diff -r1.9 -r1.10 pkgsrc/graphics/imlib2/options.mk
cvs diff -r1.9 -r1.10 pkgsrc/graphics/imlib2/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/imlib2/options.mk 2011/01/31 10:21:41 1.9
+++ pkgsrc/graphics/imlib2/options.mk 2011/05/04 02:00:02 1.10
@@ -1,34 +1,38 @@ @@ -1,34 +1,38 @@
1# $NetBSD: options.mk,v 1.9 2011/01/31 10:21:41 wiz Exp $ 1# $NetBSD: options.mk,v 1.10 2011/05/04 02:00:02 obache Exp $
2 2
3.include "../../mk/bsd.prefs.mk" 3.include "../../mk/bsd.prefs.mk"
4 4
5PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2 5PKG_OPTIONS_VAR= PKG_OPTIONS.imlib2
6PKG_SUPPORTED_OPTIONS= x11 6PKG_SUPPORTED_OPTIONS= x11
7PKG_SUGGESTED_OPTIONS= x11 7PKG_SUGGESTED_OPTIONS= x11
8.if ${MACHINE_ARCH} == "i386" 8.if ${MACHINE_ARCH} == "i386"
9PKG_SUPPORTED_OPTIONS+= mmx 9PKG_SUPPORTED_OPTIONS+= mmx
10.elif ${MACHINE_ARCH} == "x86_64" 10.elif ${MACHINE_ARCH} == "x86_64"
11PKG_SUPPORTED_OPTIONS+= imlib2-amd64 11PKG_SUPPORTED_OPTIONS+= imlib2-amd64
12PKG_SUGGESTED_OPTIONS+= imlib2-amd64 12PKG_SUGGESTED_OPTIONS+= imlib2-amd64
13.endif 13.endif
14 14
15.include "../../mk/bsd.options.mk" 15.include "../../mk/bsd.options.mk"
16 16
17.if !empty(PKG_OPTIONS:Mmmx) 17.if !empty(PKG_OPTIONS:Mmmx)
18CONFIGURE_ARGS+= --enable-mmx 18CONFIGURE_ARGS+= --enable-mmx
 19.else
 20CONFIGURE_ARGS+= --disable-mmx
19.endif 21.endif
20 22
21.if !empty(PKG_OPTIONS:Mimlib2-amd64) 23.if !empty(PKG_OPTIONS:Mimlib2-amd64)
22CONFIGURE_ARGS+= --enable-amd64 24CONFIGURE_ARGS+= --enable-amd64
 25.else
 26CONFIGURE_ARGS+= --disable-amd64
23.endif 27.endif
24 28
25PLIST_VARS+= x11 29PLIST_VARS+= x11
26 30
27.if !empty(PKG_OPTIONS:Mx11) 31.if !empty(PKG_OPTIONS:Mx11)
28.include "../../x11/xextproto/buildlink3.mk" 32.include "../../x11/xextproto/buildlink3.mk"
29.include "../../x11/libX11/buildlink3.mk" 33.include "../../x11/libX11/buildlink3.mk"
30.include "../../x11/libXext/buildlink3.mk" 34.include "../../x11/libXext/buildlink3.mk"
31PLIST.x11= yes 35PLIST.x11= yes
32.else 36.else
33CONFIGURE_ARGS+= --without-x 37CONFIGURE_ARGS+= --without-x
34.endif 38.endif