Sun Apr 8 17:21:13 2012 UTC ()
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.


(bsiegert)
diff -r1.97 -r1.98 pkgsrc/graphics/cairo/Makefile
cvs diff -r1.97 -r1.98 pkgsrc/graphics/cairo/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/Makefile 2012/02/24 10:40:49 1.97
+++ pkgsrc/graphics/cairo/Makefile 2012/04/08 17:21:13 1.98
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.97 2012/02/24 10:40:49 obache Exp $ 1# $NetBSD: Makefile,v 1.98 2012/04/08 17:21:13 bsiegert Exp $
2 2
3DISTNAME= cairo-1.10.2 3DISTNAME= cairo-1.10.2
4PKGREVISION= 4 4PKGREVISION= 4
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= http://cairographics.org/releases/ 6MASTER_SITES= http://cairographics.org/releases/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://cairographics.org/ 9HOMEPAGE= http://cairographics.org/
10COMMENT= Vector graphics library with cross-device output support 10COMMENT= Vector graphics library with cross-device output support
11LICENSE= gnu-lgpl-v2.1 AND mpl-1.1 11LICENSE= gnu-lgpl-v2.1 AND mpl-1.1
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -36,24 +36,29 @@ PLIST.carbon= yes @@ -36,24 +36,29 @@ PLIST.carbon= yes
36.include "options.mk" 36.include "options.mk"
37 37
38# For snprintf() and ctime_r() 38# For snprintf() and ctime_r()
39CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS 39CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
40 40
41TEST_TARGET= check 41TEST_TARGET= check
42 42
43# PR#43928 43# PR#43928
44.include "../../mk/compiler.mk" 44.include "../../mk/compiler.mk"
45.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*} 45.if ${MACHINE_PLATFORM:MDragonFly-*-x86_64} && ${CC_VERSION:Mgcc-4.1.*}
46CONFIGURE_ENV+= ac_cv_type___uint128_t=no 46CONFIGURE_ENV+= ac_cv_type___uint128_t=no
47.endif 47.endif
48 48
 49# Workaround so that pthread is found on MirBSD
 50.if ${OPSYS} == "MirBSD"
 51CONFIGURE_ENV+= PTHREAD_CFLAGS=${CFLAGS:Q}
 52.endif
 53
49.include "../../devel/zlib/buildlink3.mk" 54.include "../../devel/zlib/buildlink3.mk"
50.include "../../fonts/fontconfig/buildlink3.mk" 55.include "../../fonts/fontconfig/buildlink3.mk"
51BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 56BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9
52.include "../../graphics/freetype2/buildlink3.mk" 57.include "../../graphics/freetype2/buildlink3.mk"
53.include "../../graphics/png/buildlink3.mk" 58.include "../../graphics/png/buildlink3.mk"
54# include? 59# include?
55#.include "../../print/libspectre/buildlink3.mk" 60#.include "../../print/libspectre/buildlink3.mk"
56.include "../../x11/pixman/buildlink3.mk" 61.include "../../x11/pixman/buildlink3.mk"
57 62
58.include "../../mk/pthread.buildlink3.mk" 63.include "../../mk/pthread.buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"