Thu Jun 14 19:53:07 2012 UTC ()
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.


(bsiegert)
diff -r1.99 -r1.100 pkgsrc/graphics/cairo/Makefile
diff -r1.4 -r1.5 pkgsrc/graphics/cairo/hacks.mk
cvs diff -r1.99 -r1.100 pkgsrc/graphics/cairo/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/Makefile 2012/05/27 18:21:44 1.99
+++ pkgsrc/graphics/cairo/Makefile 2012/06/14 19:53:07 1.100
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.99 2012/05/27 18:21:44 dholland Exp $ 1# $NetBSD: Makefile,v 1.100 2012/06/14 19:53:07 bsiegert Exp $
2 2
3DISTNAME= cairo-1.10.2 3DISTNAME= cairo-1.10.2
4PKGREVISION= 5 4PKGREVISION= 5
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,29 +36,24 @@ PLIST.carbon= yes @@ -36,29 +36,24 @@ 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 
54.include "../../devel/zlib/buildlink3.mk" 49.include "../../devel/zlib/buildlink3.mk"
55.include "../../fonts/fontconfig/buildlink3.mk" 50.include "../../fonts/fontconfig/buildlink3.mk"
56BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9 51BUILDLINK_API_DEPENDS.freetype2+= freetype2>=2.1.9
57.include "../../graphics/freetype2/buildlink3.mk" 52.include "../../graphics/freetype2/buildlink3.mk"
58.include "../../graphics/png/buildlink3.mk" 53.include "../../graphics/png/buildlink3.mk"
59# include? 54# include?
60#.include "../../print/libspectre/buildlink3.mk" 55#.include "../../print/libspectre/buildlink3.mk"
61.include "../../x11/pixman/buildlink3.mk" 56.include "../../x11/pixman/buildlink3.mk"
62 57
63.include "../../mk/pthread.buildlink3.mk" 58.include "../../mk/pthread.buildlink3.mk"
64.include "../../mk/bsd.pkg.mk" 59.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/graphics/cairo/hacks.mk (expand / switch to unified diff)

--- pkgsrc/graphics/cairo/hacks.mk 2012/06/11 12:48:44 1.4
+++ pkgsrc/graphics/cairo/hacks.mk 2012/06/14 19:53:07 1.5
@@ -1,30 +1,35 @@ @@ -1,30 +1,35 @@
1# $NetBSD: hacks.mk,v 1.4 2012/06/11 12:48:44 obache Exp $ 1# $NetBSD: hacks.mk,v 1.5 2012/06/14 19:53:07 bsiegert Exp $
2 2
3.if !defined(CAIRO_HACKS_MK) 3.if !defined(CAIRO_HACKS_MK)
4CAIRO_HACKS_MK= defined 4CAIRO_HACKS_MK= defined
5 5
6### 6###
7### A workaround for MacPorts Ticket #31469 7### A workaround for MacPorts Ticket #31469
8### https://trac.macports.org/ticket/31469 8### https://trac.macports.org/ticket/31469
9### 9###
10.if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc) 10.if ${OPSYS} == "Darwin" && !empty(PKGSRC_COMPILER:Mgcc)
11_BAD_GCC_BUILD!= ${CC} --version | (${GREP} -c 'i686-apple-darwin11-llvm-gcc-4\.2\ .*build\ 5658' || ${TRUE}) 11_BAD_GCC_BUILD!= ${CC} --version | (${GREP} -c 'i686-apple-darwin11-llvm-gcc-4\.2\ .*build\ 5658' || ${TRUE})
12. if ${_BAD_GCC_BUILD} == "1" && exists(/usr/bin/gcc-4.2) 12. if ${_BAD_GCC_BUILD} == "1" && exists(/usr/bin/gcc-4.2)
13PKG_HACKS+= llvm-link 13PKG_HACKS+= llvm-link
14CONFIGURE_ENV+= ac_cv_prog_CC=gcc-4.2 14CONFIGURE_ENV+= ac_cv_prog_CC=gcc-4.2
15. endif 15. endif
16.endif 16.endif
17 17
 18# Workaround so that pthread is found on MirBSD
 19.if ${OPSYS} == "MirBSD"
 20PTHREAD_CFLAGS=-fhonour-copts
 21.endif
 22
18# 23#
19# Workaround for "the pixman problem" with netbsd-5 native X. The 24# Workaround for "the pixman problem" with netbsd-5 native X. The
20# problem is that if the order of rpath options isn't right when 25# problem is that if the order of rpath options isn't right when
21# linking client programs (right being /usr/pkg before /usr/X11R7), 26# linking client programs (right being /usr/pkg before /usr/X11R7),
22# the native pixman library gets pulled in instead of the pkgsrc one, 27# the native pixman library gets pulled in instead of the pkgsrc one,
23# and then the link fails with undefined symbols from cairo; these are 28# and then the link fails with undefined symbols from cairo; these are
24# symbols that are present only in the newer pkgsrc pixman. The 29# symbols that are present only in the newer pkgsrc pixman. The
25# problem with rpath options and ordering is complicated by there 30# problem with rpath options and ordering is complicated by there
26# being multiple ways of writing them (-R, -Wl,-rpath, etc.) and as 31# being multiple ways of writing them (-R, -Wl,-rpath, etc.) and as
27# many packages just blat out flags from various sources they don't 32# many packages just blat out flags from various sources they don't
28# necessarily match or come out in the right order. 33# necessarily match or come out in the right order.
29# 34#
30# Some cases of "the pixman problem" were solved with one set of 35# Some cases of "the pixman problem" were solved with one set of