diff options
| author | bsiegert <bsiegert> | 2012-06-14 19:53:07 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2012-06-14 19:53:07 +0000 |
| commit | a54a7b1802c5cc174fae64bf87f29b5d1ddb3302 (patch) | |
| tree | c80735c411e4e4e6896a6cc3cae0b1d288a47cda /graphics | |
| parent | 87ac9a3b2119a1a90c9ea1cbfc91c83f9f51e633 (diff) | |
| download | pkgsrc-a54a7b1802c5cc174fae64bf87f29b5d1ddb3302.tar.gz | |
Re-do the MirBSD hack and move it to hacks.mk, where it belongs. It needs
to be _after_ the inclusion of pthread.builtin.mk. This hopefully fixes the
MirBSD build once and for all.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/cairo/Makefile | 7 | ||||
| -rw-r--r-- | graphics/cairo/hacks.mk | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile index 73546e7fdb4..232fcdcf606 100644 --- a/graphics/cairo/Makefile +++ b/graphics/cairo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2012/05/27 18:21:44 dholland Exp $ +# $NetBSD: Makefile,v 1.100 2012/06/14 19:53:07 bsiegert Exp $ DISTNAME= cairo-1.10.2 PKGREVISION= 5 @@ -46,11 +46,6 @@ TEST_TARGET= check CONFIGURE_ENV+= ac_cv_type___uint128_t=no .endif -# Workaround so that pthread is found on MirBSD -.if ${OPSYS} == "MirBSD" -CONFIGURE_ENV+= PTHREAD_CFLAGS=${CFLAGS:Q} -.endif - .include "../../devel/zlib/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 diff --git a/graphics/cairo/hacks.mk b/graphics/cairo/hacks.mk index c2ecd6a8940..ec93e6218db 100644 --- a/graphics/cairo/hacks.mk +++ b/graphics/cairo/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.4 2012/06/11 12:48:44 obache Exp $ +# $NetBSD: hacks.mk,v 1.5 2012/06/14 19:53:07 bsiegert Exp $ .if !defined(CAIRO_HACKS_MK) CAIRO_HACKS_MK= defined @@ -15,6 +15,11 @@ CONFIGURE_ENV+= ac_cv_prog_CC=gcc-4.2 . endif .endif +# Workaround so that pthread is found on MirBSD +.if ${OPSYS} == "MirBSD" +PTHREAD_CFLAGS=-fhonour-copts +.endif + # # Workaround for "the pixman problem" with netbsd-5 native X. The # problem is that if the order of rpath options isn't right when |