aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-10-11 23:31:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-15 09:52:35 +0100
commit98f521fff9bbeb1f7f40a009620884ec664992d7 (patch)
tree3b96e28fd425356cdec66e8c2d56945398fb8038
parent3ba03d1affa6f647e9a03c8ba4389606a0da8e8b (diff)
downloadopenembedded-core-contrib-98f521fff9bbeb1f7f40a009620884ec664992d7.tar.gz
openembedded-core-contrib-98f521fff9bbeb1f7f40a009620884ec664992d7.tar.bz2
openembedded-core-contrib-98f521fff9bbeb1f7f40a009620884ec664992d7.zip
source-highlight: use with-boost-libdir
Without with-boost-libdir, it checks lib64 libx32 lib lib64 in sysroot/usr/ and set it as boost lib path if it exist, this is unreliable when build with multilib. Fixed when switch baselib from lib64 to lib, for example, when we build qemux86-64 + multilib setting, the baselib is lib64, and when disable multilib, it would be lib, then we may see the error when do_configure since lib64 may exist during build source-highlight: configure: error: Could not find a version of the Boost::Regex library! Steps to reproduce: MACHINE = "qemux86-64" require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "x86" $ bitbake world Then: MACHINE = "qemux86-64" $ bitbake source-highlight Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-support/source-highlight/source-highlight_3.1.8.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb b/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
index 37d2fa95f3f..85923e47596 100644
--- a/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
+++ b/meta/recipes-support/source-highlight/source-highlight_3.1.8.bb
@@ -15,7 +15,7 @@ DEPENDS_append = " boost"
DEPENDS_append_class-target = " source-highlight-native"
-EXTRA_OECONF = "--with-boost=${PKG_CONFIG_SYSROOT_DIR}/${prefix}"
+EXTRA_OECONF = "--with-boost=yes --with-boost-libdir=${STAGING_DIR_TARGET}${libdir}"
BBCLASSEXTEND = "native"