Sat Dec 31 15:37:56 2011 UTC ()
MirBSD build fix for pixman: use correct pthread options. No change for
other platforms.

The pthread check macro in pixman's configure is fundamentally broken,
it seems. It would be better to fix it instead of working around ...

Reviewed by Thomas Klausner.


(bsiegert)
diff -r1.43 -r1.44 pkgsrc/x11/pixman/distinfo
diff -r1.6 -r1.7 pkgsrc/x11/pixman/hacks.mk
diff -r1.9 -r1.10 pkgsrc/x11/pixman/patches/patch-af
cvs diff -r1.43 -r1.44 pkgsrc/x11/pixman/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/pixman/distinfo 2011/10/27 16:52:51 1.43
+++ pkgsrc/x11/pixman/distinfo 2011/12/31 15:37:55 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.43 2011/10/27 16:52:51 drochner Exp $ 1$NetBSD: distinfo,v 1.44 2011/12/31 15:37:55 bsiegert Exp $
2 2
3SHA1 (pixman-0.22.2.tar.bz2) = ad2b828ce4280472f5933d8bb5f0f4d583aed7f3 3SHA1 (pixman-0.22.2.tar.bz2) = ad2b828ce4280472f5933d8bb5f0f4d583aed7f3
4RMD160 (pixman-0.22.2.tar.bz2) = 13dbab02962cf45995aaebde4ec9a952ca8e6e76 4RMD160 (pixman-0.22.2.tar.bz2) = 13dbab02962cf45995aaebde4ec9a952ca8e6e76
5Size (pixman-0.22.2.tar.bz2) = 461319 bytes 5Size (pixman-0.22.2.tar.bz2) = 461319 bytes
6SHA1 (patch-aa) = 019368315a48e7f928a0d85c340da7a5131504ec 6SHA1 (patch-aa) = 019368315a48e7f928a0d85c340da7a5131504ec
7SHA1 (patch-ab) = dd31ac6ff6dffb5a29b9d2ac372be55900e773f6 7SHA1 (patch-ab) = dd31ac6ff6dffb5a29b9d2ac372be55900e773f6
8SHA1 (patch-ad) = 2841fb543df1a180a263a770d1934924a4648d8d 8SHA1 (patch-ad) = 2841fb543df1a180a263a770d1934924a4648d8d
9SHA1 (patch-ae) = 3bec7a866692b06fd2d9a1376d36277b2d618e14 9SHA1 (patch-ae) = 3bec7a866692b06fd2d9a1376d36277b2d618e14
10SHA1 (patch-af) = 53b87f118c8f287449a1a99cad1eb90d9cee1b42 10SHA1 (patch-af) = 76a94e09758f1d6e3055430c82fbcdaaefe0436d
11SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23 11SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23
12SHA1 (patch-bb) = 5017e070676b9e4613e02fe4b9d129c08abe6c7a 12SHA1 (patch-bb) = 5017e070676b9e4613e02fe4b9d129c08abe6c7a
13SHA1 (patch-bc) = 6a95770dca37d1ed0379a0b0313589a44ae0b4b0 13SHA1 (patch-bc) = 6a95770dca37d1ed0379a0b0313589a44ae0b4b0
14SHA1 (patch-bd) = cd2feeedffd78dbcc16b327d346afc0b14c78136 14SHA1 (patch-bd) = cd2feeedffd78dbcc16b327d346afc0b14c78136
cvs diff -r1.6 -r1.7 pkgsrc/x11/pixman/hacks.mk (expand / switch to unified diff)

--- pkgsrc/x11/pixman/hacks.mk 2011/07/12 22:03:28 1.6
+++ pkgsrc/x11/pixman/hacks.mk 2011/12/31 15:37:55 1.7
@@ -1,19 +1,23 @@ @@ -1,19 +1,23 @@
1# $NetBSD: hacks.mk,v 1.6 2011/07/12 22:03:28 tron Exp $ 1# $NetBSD: hacks.mk,v 1.7 2011/12/31 15:37:55 bsiegert Exp $
2# 2#
3.if !defined(PIXMAN_HACKS_MK) 3.if !defined(PIXMAN_HACKS_MK)
4PIXMAN_HACKS_MK= # empty 4PIXMAN_HACKS_MK= # empty
5. include "../../mk/bsd.fast.prefs.mk" 5. include "../../mk/bsd.fast.prefs.mk"
6. include "../../mk/compiler.mk" 6. include "../../mk/compiler.mk"
7### 7###
8### XXX SSE2 intrinsics require gcc-4.2+ to build. 8### XXX SSE2 intrinsics require gcc-4.2+ to build.
9### 9###
10.if empty(CC_VERSION:Mgcc-4.[2-9]*) && \ 10.if empty(CC_VERSION:Mgcc-4.[2-9]*) && \
11 empty(CC_VERSION:Mgcc-[5-9].*) && \ 11 empty(CC_VERSION:Mgcc-[5-9].*) && \
12 empty(CC_VERSION:Mgcc-[1-9][0-9]*) 12 empty(CC_VERSION:Mgcc-[1-9][0-9]*)
13CONFIGURE_ARGS+= --disable-sse2 13CONFIGURE_ARGS+= --disable-sse2
14. endif 14. endif
15.endif 15.endif
16 16
17.if !empty(PKGSRC_COMPILER:Msunpro) 17.if !empty(PKGSRC_COMPILER:Msunpro)
18CONFIGURE_ARGS+= --disable-sse2 --disable-mmx 18CONFIGURE_ARGS+= --disable-sse2 --disable-mmx
19.endif 19.endif
 20
 21.if ${OPSYS} == "MirBSD"
 22CONFIGURE_ARGS+= PTHREAD_LIBS=-pthread
 23.endif
cvs diff -r1.9 -r1.10 pkgsrc/x11/pixman/patches/Attic/patch-af (expand / switch to unified diff)

--- pkgsrc/x11/pixman/patches/Attic/patch-af 2011/01/26 19:25:55 1.9
+++ pkgsrc/x11/pixman/patches/Attic/patch-af 2011/12/31 15:37:55 1.10
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-af,v 1.9 2011/01/26 19:25:55 drochner Exp $ 1$NetBSD: patch-af,v 1.10 2011/12/31 15:37:55 bsiegert Exp $
2 2
3--- pixman/pixman-compiler.h.orig 2011-01-19 13:05:40.000000000 +0000 3--- pixman/pixman-compiler.h.orig Mon Jul 4 20:22:16 2011
4+++ pixman/pixman-compiler.h 4+++ pixman/pixman-compiler.h
5@@ -82,7 +82,7 @@ 5@@ -82,7 +82,7 @@
6 # define PIXMAN_GET_THREAD_LOCAL(name) \ 6 # define PIXMAN_GET_THREAD_LOCAL(name) \
7 (&name) 7 (&name)
8  8
9-#elif defined(TOOLCHAIN_SUPPORTS__THREAD) 9-#elif defined(TOOLCHAIN_SUPPORTS__THREAD)
10+#elif defined(TOOLCHAIN_SUPPORTS__THREAD) && !defined(__NetBSD__) 10+#elif defined(TOOLCHAIN_SUPPORTS__THREAD) && !defined(__NetBSD__)
11  11
12 # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \ 12 # define PIXMAN_DEFINE_THREAD_LOCAL(type, name) \
13 static __thread type name 13 static __thread type name
14@@ -149,7 +149,7 @@ 14@@ -149,7 +149,7 @@
15 # define PIXMAN_GET_THREAD_LOCAL(name) \ 15 # define PIXMAN_GET_THREAD_LOCAL(name) \
16 (&name) 16 (&name)
17  17
18-#elif defined(HAVE_PTHREAD_SETSPECIFIC) 18-#elif defined(HAVE_PTHREAD_SETSPECIFIC)
19+#elif defined(HAVE_PTHREAD_SETSPECIFIC) || defined(__NetBSD__) 19+#elif defined(HAVE_PTHREAD_SETSPECIFIC) || defined(__NetBSD__) || defined(__MirBSD__)
20  20
21 #include <pthread.h> 21 #include <pthread.h>
22  22