summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-25 14:03:13 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-25 14:34:36 (GMT)
commit659aadbd290d4f021f822415232e12f3462650c6 (patch)
tree7fda7057cc792378555abfd99be0c47883aaf7df
parent3c5f4d54d01887a117bf659fc9af6b2b892c2b08 (diff)
downloadpoky-659aadbd290d4f021f822415232e12f3462650c6.tar.gz
libxcb: fix repeated configures
If configure is re-ran on an existing build tree the string substitutions we need are done twice, resulting in invalid paths. Anchor the expressions so they only match a pristine configure.ac. (From OE-Core rev: a167176c3e41e4eb2a1931df566367e3da2b3b86) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xcb/libxcb.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-graphics/xcb/libxcb.inc b/meta/recipes-graphics/xcb/libxcb.inc
index 5f4df69..124fe3d 100644
--- a/meta/recipes-graphics/xcb/libxcb.inc
+++ b/meta/recipes-graphics/xcb/libxcb.inc
@@ -51,12 +51,12 @@ FILES_libxcb-xvmc = "${libdir}/libxcb-xvmc.so.*"
51 51
52inherit autotools pkgconfig pythonnative 52inherit autotools pkgconfig pythonnative
53 53
54# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto` 54# XCBPROTO_XCBINCLUDEDIR is set based on `pkg-config --variable=xcbincludedir xcb-proto`
55# but the xcbincludedir variable doesn't point into the staging area, so it needs some 55# but the xcbincludedir variable doesn't point into the staging area, so it needs some
56# tweeking here: 56# tweaking here:
57do_configure_prepend () { 57do_configure_prepend () {
58 sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/|" \ 58 sed -i "s|XCBPROTO_XCBINCLUDEDIR=\`|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/\`|" \
59 ${S}/configure.ac 59 ${S}/configure.ac
60 sed -i "s|XCBPROTO_XCBPYTHONDIR=|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/|" \ 60 sed -i "s|XCBPROTO_XCBPYTHONDIR=\`|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/\`|" \
61 ${S}/configure.ac 61 ${S}/configure.ac
62} 62}