pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/pkgsrc-2012Q1]: pkgsrc/graphics/cairo Pullup ticket #3727 - requested...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a0fa028993b1
branches:  pkgsrc-2012Q1
changeset: 602017:a0fa028993b1
user:      spz <spz%pkgsrc.org@localhost>
date:      Mon Apr 09 19:52:24 2012 +0000

description:
Pullup ticket #3727 - requested by bsiegert
graphics/cairo: build fix

Revisions pulled up:
- graphics/cairo/Makefile                                       1.98

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   bsiegert
   Date:           Sun Apr  8 17:21:13 UTC 2012

   Modified Files:
           pkgsrc/graphics/cairo: Makefile

   Log Message:
   Fix build on MirBSD by working around a bug in configure.

   The problem is the following: When checking the CFLAGS / LIBS for
   including pthread support, any warning on stdout is counted as a no.
   However, the test does not use CFLAGS on the command line, which
   produces a harmless debug warning. This workaround has the consequence
   of adding the default CFLAGS twice on the command line but this is not
   a problem.


   To generate a diff of this commit:
   cvs rdiff -u -r1.97 -r1.98 pkgsrc/graphics/cairo/Makefile

diffstat:

 graphics/cairo/Makefile |  7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diffs (21 lines):

diff -r 021a9d703f6c -r a0fa028993b1 graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Mon Apr 09 19:02:37 2012 +0000
+++ b/graphics/cairo/Makefile   Mon Apr 09 19:52:24 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.97 2012/02/24 10:40:49 obache Exp $
+# $NetBSD: Makefile,v 1.97.2.1 2012/04/09 19:52:24 spz Exp $
 
 DISTNAME=      cairo-1.10.2
 PKGREVISION=   4
@@ -46,6 +46,11 @@
 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



Home | Main Index | Thread Index | Old Index