diff options
| author | bsiegert <bsiegert> | 2011-12-31 15:37:55 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2011-12-31 15:37:55 +0000 |
| commit | a41afcc44d5fb16bdae7779f3ea91039d8c9895d (patch) | |
| tree | 5d2b5333e286638eb0c2831408f2f0c58e368aa5 /x11 | |
| parent | 4ba18390f7933c1ca44a032a2268b549da167641 (diff) | |
| download | pkgsrc-a41afcc44d5fb16bdae7779f3ea91039d8c9895d.tar.gz | |
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.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/pixman/distinfo | 4 | ||||
| -rw-r--r-- | x11/pixman/hacks.mk | 6 | ||||
| -rw-r--r-- | x11/pixman/patches/patch-af | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/x11/pixman/distinfo b/x11/pixman/distinfo index 33bfb1532e1..c810e36159c 100644 --- a/x11/pixman/distinfo +++ b/x11/pixman/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.43 2011/10/27 16:52:51 drochner Exp $ +$NetBSD: distinfo,v 1.44 2011/12/31 15:37:55 bsiegert Exp $ SHA1 (pixman-0.22.2.tar.bz2) = ad2b828ce4280472f5933d8bb5f0f4d583aed7f3 RMD160 (pixman-0.22.2.tar.bz2) = 13dbab02962cf45995aaebde4ec9a952ca8e6e76 @@ -7,7 +7,7 @@ SHA1 (patch-aa) = 019368315a48e7f928a0d85c340da7a5131504ec SHA1 (patch-ab) = dd31ac6ff6dffb5a29b9d2ac372be55900e773f6 SHA1 (patch-ad) = 2841fb543df1a180a263a770d1934924a4648d8d SHA1 (patch-ae) = 3bec7a866692b06fd2d9a1376d36277b2d618e14 -SHA1 (patch-af) = 53b87f118c8f287449a1a99cad1eb90d9cee1b42 +SHA1 (patch-af) = 76a94e09758f1d6e3055430c82fbcdaaefe0436d SHA1 (patch-ba) = 9bd8a7fd0cfbd280df06d69838d3d10ab1b51e23 SHA1 (patch-bb) = 5017e070676b9e4613e02fe4b9d129c08abe6c7a SHA1 (patch-bc) = 6a95770dca37d1ed0379a0b0313589a44ae0b4b0 diff --git a/x11/pixman/hacks.mk b/x11/pixman/hacks.mk index 667b4121d43..c8b3bfaa00c 100644 --- a/x11/pixman/hacks.mk +++ b/x11/pixman/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.6 2011/07/12 22:03:28 tron Exp $ +# $NetBSD: hacks.mk,v 1.7 2011/12/31 15:37:55 bsiegert Exp $ # .if !defined(PIXMAN_HACKS_MK) PIXMAN_HACKS_MK= # empty @@ -17,3 +17,7 @@ CONFIGURE_ARGS+= --disable-sse2 .if !empty(PKGSRC_COMPILER:Msunpro) CONFIGURE_ARGS+= --disable-sse2 --disable-mmx .endif + +.if ${OPSYS} == "MirBSD" +CONFIGURE_ARGS+= PTHREAD_LIBS=-pthread +.endif diff --git a/x11/pixman/patches/patch-af b/x11/pixman/patches/patch-af index 35117097b82..fdd38c7ec3f 100644 --- a/x11/pixman/patches/patch-af +++ b/x11/pixman/patches/patch-af @@ -1,6 +1,6 @@ -$NetBSD: patch-af,v 1.9 2011/01/26 19:25:55 drochner Exp $ +$NetBSD: patch-af,v 1.10 2011/12/31 15:37:55 bsiegert Exp $ ---- pixman/pixman-compiler.h.orig 2011-01-19 13:05:40.000000000 +0000 +--- pixman/pixman-compiler.h.orig Mon Jul 4 20:22:16 2011 +++ pixman/pixman-compiler.h @@ -82,7 +82,7 @@ # define PIXMAN_GET_THREAD_LOCAL(name) \ @@ -16,7 +16,7 @@ $NetBSD: patch-af,v 1.9 2011/01/26 19:25:55 drochner Exp $ (&name) -#elif defined(HAVE_PTHREAD_SETSPECIFIC) -+#elif defined(HAVE_PTHREAD_SETSPECIFIC) || defined(__NetBSD__) ++#elif defined(HAVE_PTHREAD_SETSPECIFIC) || defined(__NetBSD__) || defined(__MirBSD__) #include <pthread.h> |