diff options
| author | tron <tron> | 2011-07-12 18:23:09 +0000 |
|---|---|---|
| committer | tron <tron> | 2011-07-12 18:23:09 +0000 |
| commit | ce0743bbe1868ae6151527c11741ccfe6c29b524 (patch) | |
| tree | de0300ef9fbbf50abc39e214366e35f5e0a9ca15 | |
| parent | 298e1c6f099d221703bddbdae733e5cf67455507 (diff) | |
| download | pkgsrc-ce0743bbe1868ae6151527c11741ccfe6c29b524.tar.gz | |
Fix last commit:
1.) The check in "pkgsrc/x11/pixman/Makefile" was incorrect and always
disabled SSE2. Remove it which also fixes the Mac OS X build as
the necessary patch for the test program gets applied again.
2.) Correct the existing SSE2 handling in "pkgsrc/x11/pixman/hacks.mk":
- Correctly match the various GCC versions.
- Disable SSE2 for both amd64 and i386 when old versions of GCC
are used.
| -rw-r--r-- | x11/pixman/Makefile | 6 | ||||
| -rw-r--r-- | x11/pixman/hacks.mk | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/x11/pixman/Makefile b/x11/pixman/Makefile index 910487abab0..6b870312383 100644 --- a/x11/pixman/Makefile +++ b/x11/pixman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2011/07/12 13:28:31 tron Exp $ +# $NetBSD: Makefile,v 1.43 2011/07/12 18:23:09 tron Exp $ DISTNAME= pixman-0.22.2 PKGREVISION= 1 @@ -45,11 +45,9 @@ post-extract: .include "../../mk/bsd.prefs.mk" -.if !empty(MACHINE_PLATFORM:NetBSD-*-x86_64) -CONFIGURE_ARGS+= --disable-sse2 # Link the tests with the static library under Mac OS X as we cannot use # the shared library out of the build area. -.elif ${OPSYS} == "Darwin" +.if ${OPSYS} == "Darwin" SUBST_CLASSES+= pixmantests SUBST_STAGE.pixmantests= post-configure SUBST_FILES.pixmantests= test/Makefile diff --git a/x11/pixman/hacks.mk b/x11/pixman/hacks.mk index f6290f9c768..175ff9aff2a 100644 --- a/x11/pixman/hacks.mk +++ b/x11/pixman/hacks.mk @@ -1,15 +1,15 @@ -# $NetBSD: hacks.mk,v 1.4 2009/12/16 22:28:32 tnn Exp $ +# $NetBSD: hacks.mk,v 1.5 2011/07/12 18:23:09 tron Exp $ # .if !defined(PIXMAN_HACKS_MK) PIXMAN_HACKS_MK= # empty . include "../../mk/bsd.fast.prefs.mk" . include "../../mk/compiler.mk" ### -### XXX SSE2 intrinsics require gcc-4.2+ to build unless -### ${MACHINE_ARCH} == "x86_64". +### XXX SSE2 intrinsics require gcc-4.2+ to build. ### -.if (empty(MACHINE_ARCH:Mx86_64) && \ - (empty(CC_VERSION:Mgcc-4.[2-9]*) || empty(CC_VERSION:Mgcc-[5-9].*) || empty(CC_VERSION:Mgcc-[1-9][0-9]*))) +.if empty(CC_VERSION:Mgcc-4.[2-9]*) && \ + empty(CC_VERSION:Mgcc-[5-9].*) && \ + empty(CC_VERSION:Mgcc-[1-9][0-9].*) CONFIGURE_ARGS+= --disable-sse2 . endif .endif |