diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-12-09 16:58:27 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-10 17:42:41 +0000 |
| commit | 47d2089bfcaa91777039881359bcade61360d537 (patch) | |
| tree | c7e0037603c74206cb72c35a2c1d66ec22333101 /meta/recipes-graphics/xorg-lib/libxcb | |
| parent | 62e8b4cc200734241433fad9bf727df3b70ab92c (diff) | |
| download | poky-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/recipes-graphics/xorg-lib/libxcb')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb/xcbincludedir.patch | 23 |
1 files changed, 19 insertions, 4 deletions
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 @@ | |||
| 1 | Upstream-Status: Inappropriate [configuration] | 1 | As pkg-config --variable doesn't respect the sysroot, add the pkg-config sysroot |
| 2 | to 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 | 4 | Upstream-Status: Pending |
| 4 | +++ libxcb-1.0/configure.ac 2008-09-10 20:29:12.000000000 +0100 | 5 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 5 | @@ -50,7 +50,7 @@ | 6 | |
| 7 | diff --git a/configure.ac b/configure.ac | ||
| 8 | index 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 | |||