sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ross Burton 2013-03-25 14:03:13 +00:00 committed by Richard Purdie
parent 3c5f4d54d0
commit 659aadbd29
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-graphics/xcb/libxcb.inc
View File

@ -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
}