bitbake.conf: Remove double slash from PATH_prepend and PKG_CONFIG_DIR
* we correctly have
${STAGING_DIR_NATIVE}${base_sbindir_native}
and then double slash in
${STAGING_DIR_NATIVE}/${base_bindir_native}
* similar in PKG_CONFIG_DIR where libdir also starts with slash
${STAGING_DIR_HOST}/${libdir}/pkgconfig
* also fix double slash in insane.bbclass and staging.bbclass
* I was a bit nervous about staging change (in case the / was important
in some weird use-case, but the extra slash is there since following
commit where other extra slashes were removed only the one before
libdir was kept:
commit 6ea78d6489
Author: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon Nov 2 17:10:51 2009 +0000
autotools.bbclass: Separate out useful staging functions into
base.bbclass and call from autotools classes
* this isn't fixing any real-world issue AFAIK, I was just trying to
debug one weird case where debugedit fails with
canonicalization unexpectedly shrank by one character
and it's easier to grep for '//' without many harmless instances
already in run* scripts etc
(From OE-Core rev: 0ddaf52e9e344986ae2b016cc068d9eee71b4347)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
049627735f
commit
f33afade31
|
@ -861,7 +861,7 @@ python do_package_qa () {
|
|||
python do_qa_staging() {
|
||||
bb.note("QA checking staging")
|
||||
|
||||
if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}/${STAGING_LIBDIR}'), d):
|
||||
if not package_qa_check_staged(d.expand('${SYSROOT_DESTDIR}${STAGING_LIBDIR}'), d):
|
||||
bb.fatal("QA staging was broken by the package built above")
|
||||
}
|
||||
|
||||
|
|
|
@ -40,7 +40,7 @@ sysroot_stage_dirs() {
|
|||
fi
|
||||
if [ -d $from${libdir} ]
|
||||
then
|
||||
sysroot_stage_libdir $from/${libdir} $to${libdir}
|
||||
sysroot_stage_libdir $from${libdir} $to${libdir}
|
||||
fi
|
||||
if [ -d $from${base_libdir} ]
|
||||
then
|
||||
|
|
|
@ -426,7 +426,7 @@ EXTRA_IMAGEDEPENDS = ""
|
|||
# Toolchain info.
|
||||
##################################################################
|
||||
|
||||
PATH_prepend = "${COREBASE}/scripts:${STAGING_BINDIR_TOOLCHAIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}/${base_bindir_native}:"
|
||||
PATH_prepend = "${COREBASE}/scripts:${STAGING_BINDIR_TOOLCHAIN}:${STAGING_BINDIR_CROSS}:${STAGING_DIR_NATIVE}${sbindir_native}:${STAGING_BINDIR_NATIVE}:${STAGING_DIR_NATIVE}${base_sbindir_native}:${STAGING_DIR_NATIVE}${base_bindir_native}:"
|
||||
export PATH
|
||||
|
||||
##################################################################
|
||||
|
@ -643,7 +643,7 @@ BUILDCFG_NEEDEDVARS[type] = "list"
|
|||
|
||||
# Other
|
||||
|
||||
export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}/${libdir}/pkgconfig"
|
||||
export PKG_CONFIG_DIR = "${STAGING_DIR_HOST}${libdir}/pkgconfig"
|
||||
export PKG_CONFIG_PATH = "${PKG_CONFIG_DIR}:${STAGING_DATADIR}/pkgconfig"
|
||||
export PKG_CONFIG_LIBDIR = "${PKG_CONFIG_DIR}"
|
||||
export PKG_CONFIG_SYSROOT_DIR = "${STAGING_DIR_HOST}"
|
||||
|
|
Loading…
Reference in New Issue