From 1d1577727fe23262c577466afd6513169cc920c7 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 25 Mar 2013 14:03:13 +0000 Subject: [PATCH] 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/xcb/libxcb.inc | 8 ++++---- 1 file 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.*" inherit autotools pkgconfig pythonnative -# XCBPROTO_XCBINCLUDEDIR is setup based on `pkg-config --variable=xcbincludedir xcb-proto` +# XCBPROTO_XCBINCLUDEDIR is set based on `pkg-config --variable=xcbincludedir xcb-proto` # but the xcbincludedir variable doesn't point into the staging area, so it needs some -# tweeking here: +# tweaking here: do_configure_prepend () { - sed -i "s|XCBPROTO_XCBINCLUDEDIR=|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/|" \ + sed -i "s|XCBPROTO_XCBINCLUDEDIR=\`|XCBPROTO_XCBINCLUDEDIR=${STAGING_DIR_HOST}/\`|" \ ${S}/configure.ac - sed -i "s|XCBPROTO_XCBPYTHONDIR=|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/|" \ + sed -i "s|XCBPROTO_XCBPYTHONDIR=\`|XCBPROTO_XCBPYTHONDIR=${STAGING_DIR_HOST}/\`|" \ ${S}/configure.ac } -- 2.7.4