[OE-core] [PATCH 08/18] tcl: fix buildpath QA issue

[Hongxu Jia]

- Tweak DEBUG_FLAGS, since ${S} is not normal format

- Remove build path in tclConfig.sh

- Tweak sed expression at tclConfig.sh to strict the pattern

[YOCTO #8457]

Signed-off-by: Hongxu Jia <hongxu....@windriver.com>
---
 meta/recipes-devtools/tcltk/tcl_8.6.4.bb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.4.bb 
b/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
index 8e92b3e..f32419e 100644
--- a/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
+++ b/meta/recipes-devtools/tcltk/tcl_8.6.4.bb
@@ -30,6 +30,7 @@ SRC_URI[sha256sum] = 
"9e6ed94c981c1d0c5f5fefb8112d06c6bf4d050a7327e95e71d417c416
 SRC_URI_class-native = "${BASE_SRC_URI}"
 
 S = "${WORKDIR}/${BPN}${PV}/unix"
+DEBUG_FLAGS += "-fdebug-prefix-map=${WORKDIR}/${BPN}${PV}=/usr/src/${BPN}"
 
 VER = "${PV}"
 
@@ -54,8 +55,8 @@ do_install() {
        autotools_do_install install-private-headers
        ln -sf ./tclsh${VER} ${D}${bindir}/tclsh
        ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER}
-       sed -i "s+-L${B}+-L${STAGING_LIBDIR}+g" tclConfig.sh
-       sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
+       sed -i "s,-L${B},-L${STAGING_LIBDIR},g" tclConfig.sh
+       sed -i "s,='${WORKDIR},='${STAGING_INCDIR},g" tclConfig.sh
        sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
        sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh
        install -d ${D}${bindir_crossscripts}
@@ -73,6 +74,14 @@ tcl_sysroot_preprocess () {
        sysroot_stage_dir ${D}${bindir_crossscripts} 
${SYSROOT_DESTDIR}${bindir_crossscripts}
 }
 
+inherit fix_buildpaths
+PACKAGE_BUILDPATH_TEXT_FILES ?= "${bindir_crossscripts}/tclConfig.sh \
+                                 ${libdir}/tclConfig.sh \
+"
+PACKAGE_BUILDPATH_TEXT_PATTERNS += " \
+    -e 's:-fdebug-prefix-map=${WORKDIR}/${BPN}${PV}=/usr/src/${BPN}::g'\
+"
+
 PACKAGES =+ "tcl-lib"
 FILES_tcl-lib = "${libdir}/libtcl8.6.so.*"
 FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8"
-- 
1.9.1

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core