Fri May 10 22:40:31 2013 UTC ()
Make libxcb and xcb-proto cross-compile.


(riastradh)
diff -r1.20 -r1.21 pkgsrc/x11/libxcb/Makefile
diff -r1.10 -r1.11 pkgsrc/x11/xcb-proto/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/x11/libxcb/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/libxcb/Makefile 2013/02/01 14:40:29 1.20
+++ pkgsrc/x11/libxcb/Makefile 2013/05/10 22:40:31 1.21
@@ -1,36 +1,47 @@ @@ -1,36 +1,47 @@
1# $NetBSD: Makefile,v 1.20 2013/02/01 14:40:29 jperkin Exp $ 1# $NetBSD: Makefile,v 1.21 2013/05/10 22:40:31 riastradh Exp $
2# 2#
3 3
4DISTNAME= libxcb-1.9 4DISTNAME= libxcb-1.9
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= http://xcb.freedesktop.org/dist/ 6MASTER_SITES= http://xcb.freedesktop.org/dist/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= reed@reedmedia.net 9MAINTAINER= reed@reedmedia.net
10HOMEPAGE= http://xcb.freedesktop.org/ 10HOMEPAGE= http://xcb.freedesktop.org/
11COMMENT= X protocol C-language Binding 11COMMENT= X protocol C-language Binding
12LICENSE= mit # with no-advertising clause 12LICENSE= mit # with no-advertising clause
13 13
14BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt 14TOOL_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt
15BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.7:../../x11/py-xcbgen 15TOOL_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.7:../../x11/py-xcbgen
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
20 20
21CONFIGURE_ARGS+= --disable-build-docs # or needs doxygen 21CONFIGURE_ARGS+= --disable-build-docs # or needs doxygen
22CONFIGURE_ARGS+= --disable-doxygen 22CONFIGURE_ARGS+= --disable-doxygen
23 23
 24.include "../../mk/bsd.prefs.mk"
 25
 26.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS])
 27# No native C compiler needed -- the tool that gobbles up the xcb
 28# prototypes is in Python.
 29#
 30# XXX This needs to match the version of xcb-proto we get for the
 31# target by buildlink3.
 32TOOL_DEPENDS+= xcb-proto-[0-9]*:../../x11/xcb-proto
 33.endif
 34
24# Adds -Wl,-R to pkgconfig files automatically 35# Adds -Wl,-R to pkgconfig files automatically
25PKGCONFIG_OVERRIDE+= xcb-composite.pc.in 36PKGCONFIG_OVERRIDE+= xcb-composite.pc.in
26PKGCONFIG_OVERRIDE+= xcb-damage.pc.in 37PKGCONFIG_OVERRIDE+= xcb-damage.pc.in
27PKGCONFIG_OVERRIDE+= xcb-dpms.pc.in 38PKGCONFIG_OVERRIDE+= xcb-dpms.pc.in
28PKGCONFIG_OVERRIDE+= xcb-glx.pc.in 39PKGCONFIG_OVERRIDE+= xcb-glx.pc.in
29PKGCONFIG_OVERRIDE+= xcb-randr.pc.in 40PKGCONFIG_OVERRIDE+= xcb-randr.pc.in
30PKGCONFIG_OVERRIDE+= xcb-record.pc.in 41PKGCONFIG_OVERRIDE+= xcb-record.pc.in
31PKGCONFIG_OVERRIDE+= xcb-render.pc.in 42PKGCONFIG_OVERRIDE+= xcb-render.pc.in
32PKGCONFIG_OVERRIDE+= xcb-res.pc.in 43PKGCONFIG_OVERRIDE+= xcb-res.pc.in
33PKGCONFIG_OVERRIDE+= xcb-screensaver.pc.in 44PKGCONFIG_OVERRIDE+= xcb-screensaver.pc.in
34PKGCONFIG_OVERRIDE+= xcb-shape.pc.in 45PKGCONFIG_OVERRIDE+= xcb-shape.pc.in
35PKGCONFIG_OVERRIDE+= xcb-shm.pc.in 46PKGCONFIG_OVERRIDE+= xcb-shm.pc.in
36PKGCONFIG_OVERRIDE+= xcb-sync.pc.in 47PKGCONFIG_OVERRIDE+= xcb-sync.pc.in
@@ -61,21 +72,21 @@ SUBST_CLASSES+= pc @@ -61,21 +72,21 @@ SUBST_CLASSES+= pc
61SUBST_FILES.pc= xcb.pc.in 72SUBST_FILES.pc= xcb.pc.in
62SUBST_MESSAGE.pc= Configuring threading in xcb.pc.in. 73SUBST_MESSAGE.pc= Configuring threading in xcb.pc.in.
63SUBST_STAGE.pc= pre-configure 74SUBST_STAGE.pc= pre-configure
64SUBST_VARS.pc= XTHREADLIB XTHREAD_CPPFLAGS 75SUBST_VARS.pc= XTHREADLIB XTHREAD_CPPFLAGS
65 76
66post-extract: 77post-extract:
67 ${CHMOD} -R go-w ${WRKSRC} 78 ${CHMOD} -R go-w ${WRKSRC}
68 79
69### 80###
70### XXX needed to build from scratch, but we're patching right now 81### XXX needed to build from scratch, but we're patching right now
71### so it's not needed (nor should it ever be, really). 82### so it's not needed (nor should it ever be, really).
72### 83###
73#.include "../../devel/gperf/buildlink3.mk" 84#.include "../../devel/gperf/buildlink3.mk"
74PYTHON_FOR_BUILD_ONLY= yes 85PYTHON_FOR_BUILD_ONLY= tool
75.include "../../lang/python/application.mk" 86.include "../../lang/python/application.mk"
76BUILDLINK_API_DEPENDS.xcb-proto?= xcb-proto>=1.8 87BUILDLINK_API_DEPENDS.xcb-proto?= xcb-proto>=1.8
77.include "../../x11/xcb-proto/buildlink3.mk" 88.include "../../x11/xcb-proto/buildlink3.mk"
78.include "../../x11/libXdmcp/buildlink3.mk" 89.include "../../x11/libXdmcp/buildlink3.mk"
79.include "../../x11/libXau/buildlink3.mk" 90.include "../../x11/libXau/buildlink3.mk"
80 91
81.include "../../mk/bsd.pkg.mk" 92.include "../../mk/bsd.pkg.mk"
cvs diff -r1.10 -r1.11 pkgsrc/x11/xcb-proto/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xcb-proto/Makefile 2012/10/29 05:06:58 1.10
+++ pkgsrc/x11/xcb-proto/Makefile 2013/05/10 22:40:31 1.11
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.10 2012/10/29 05:06:58 asau Exp $ 1# $NetBSD: Makefile,v 1.11 2013/05/10 22:40:31 riastradh Exp $
2# 2#
3 3
4DISTNAME= xcb-proto-1.8 4DISTNAME= xcb-proto-1.8
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= http://xcb.freedesktop.org/dist/ 6MASTER_SITES= http://xcb.freedesktop.org/dist/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= reed@reedmedia.net 9MAINTAINER= reed@reedmedia.net
10HOMEPAGE= http://xcb.freedesktop.org/ 10HOMEPAGE= http://xcb.freedesktop.org/
11COMMENT= XCB protocol descriptions (in XML) 11COMMENT= XCB protocol descriptions (in XML)
12LICENSE= mit # with no-advertising clause 12LICENSE= mit # with no-advertising clause
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16USE_LANGUAGES= # none 16USE_LANGUAGES= # none
17 17
18PKGCONFIG_OVERRIDE+= xcb-proto.pc.in 18PKGCONFIG_OVERRIDE+= xcb-proto.pc.in
19 19
20CONFIGURE_ENV+= XMLLLINT=${BUILDLINK_PREFIX.libxml}/bin/xmllint 20CONFIGURE_ENV+= XMLLLINT=${BUILDLINK_PREFIX.libxml}/bin/xmllint
21 21
22# XXX just for the "configure" check 22# XXX just for the "configure" check
23PYTHON_FOR_BUILD_ONLY= yes 23PYTHON_FOR_BUILD_ONLY= tool
24.include "../../lang/python/application.mk" 24.include "../../lang/python/application.mk"
25BUILDLINK_DEPMETHOD.libxml2?= build 25BUILDLINK_DEPMETHOD.libxml2?= build
26.include "../../textproc/libxml2/buildlink3.mk" 26.include "../../textproc/libxml2/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 27.include "../../mk/bsd.pkg.mk"