summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-12-09 16:58:27 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-12-10 17:42:41 +0000
commit47d2089bfcaa91777039881359bcade61360d537 (patch)
treec7e0037603c74206cb72c35a2c1d66ec22333101 /meta
parent62e8b4cc200734241433fad9bf727df3b70ab92c (diff)
downloadpoky-47d2089bfcaa91777039881359bcade61360d537.tar.gz
libxcb: fix rebuild when MACHINE changes
This recipe was patching the sysroot path directly into configure.ac, which fails when the same source tree is re-used for another machine. Instead, patch in $PKG_CONFIG_SYSROOT_DIR which is already exported for use by pkg-config. Also remove some commented-out lines that have no purpose. (From OE-Core rev: e7876641c684448c6760050f23fd17dd5e850b48) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcb.inc16
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch23
2 files changed, 21 insertions, 18 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc
index 91df1be8c5..7f9b0af66c 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb.inc
+++ b/meta/recipes-graphics/xorg-lib/libxcb.inc
@@ -12,10 +12,9 @@ LICENSE = "MIT-X"
12 12
13PARALLEL_MAKE = "" 13PARALLEL_MAKE = ""
14DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native libpthread-stubs" 14DEPENDS = "xcb-proto xproto libxau libxslt-native xcb-proto-native libpthread-stubs"
15# DEPENDS += "xsltproc-native gperf-native"
16 15
17SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" 16SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
18# file://xcbincludedir.patch" 17 file://xcbincludedir.patch"
19 18
20PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ 19PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \
21 libxcb-randr libxcb-record libxcb-render libxcb-res \ 20 libxcb-randr libxcb-record libxcb-render libxcb-res \
@@ -25,7 +24,6 @@ PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \
25 libxcb-dri2 libxcb-dri3 libxcb-present" 24 libxcb-dri2 libxcb-dri3 libxcb-present"
26 25
27FILES_${PN} = "${libdir}/libxcb.so.*" 26FILES_${PN} = "${libdir}/libxcb.so.*"
28#FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h"
29FILES_libxcb-dri2 = "${libdir}/libxcb-dri2.so.*" 27FILES_libxcb-dri2 = "${libdir}/libxcb-dri2.so.*"
30FILES_libxcb-dri3 = "${libdir}/libxcb-dri3.so.*" 28FILES_libxcb-dri3 = "${libdir}/libxcb-dri3.so.*"
31FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" 29FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*"
@@ -52,13 +50,3 @@ FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
52FILES_libxcb-present = "${libdir}/libxcb-present.so.*" 50FILES_libxcb-present = "${libdir}/libxcb-present.so.*"
53 51
54inherit autotools pkgconfig pythonnative 52inherit autotools pkgconfig pythonnative
55
56# XCBPROTO_XCBINCLUDEDIR is set based on `pkg-config --variable=xcbincludedir xcb-proto`
57# but the xcbincludedir variable doesn't point into the staging area, so it needs some
58# tweaking here:
59do_configure_prepend () {
60 sed -i "s|XCBPROTO_XCBINCLUDEDIR=\`|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/\`|" \
61 ${S}/configure.ac
62 sed -i "s|XCBPROTO_XCBPYTHONDIR=\`|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/\`|" \
63 ${S}/configure.ac
64}
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch b/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
index d858a63b72..46297c33c3 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
+++ b/meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch
@@ -1,8 +1,14 @@
1Upstream-Status: Inappropriate [configuration] 1As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot
2to the beginning of variables that are used later on the host.
2 3
3--- libxcb-1.0.orig/configure.ac 2006-11-23 15:33:01.000000000 +0000 4Upstream-Status: Pending
4+++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100 5Signed-off-by: Ross Burton <ross.burton@intel.com>
5@@ -50,7 +50,7 @@ 6
7diff --git a/configure.ac b/configure.ac
8index 94da4f7..d29cd6a 100644
9--- a/configure.ac
10+++ b/configure.ac
11@@ -64,7 +64,7 @@ AC_SUBST(NEEDED)
6 12
7 # Find the xcb-proto protocol descriptions 13 # Find the xcb-proto protocol descriptions
8 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR) 14 AC_MSG_CHECKING(XCBPROTO_XCBINCLUDEDIR)
@@ -11,3 +17,12 @@ Upstream-Status: Inappropriate [configuration]
11 AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR) 17 AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
12 AC_SUBST(XCBPROTO_XCBINCLUDEDIR) 18 AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
13 19
20@@ -74,7 +74,7 @@ AC_SUBST(XCBPROTO_VERSION)
21
22 # Find the xcbgen Python package
23 AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR)
24-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
25+XCBPROTO_XCBPYTHONDIR=$PKG_CONFIG_SYSROOT_DIR/`$PKG_CONFIG --variable=pythondir xcb-proto`
26 AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
27 AC_SUBST(XCBPROTO_XCBPYTHONDIR)
28