[oe-commits] [openembedded-core] 47/49: libtool-cross: Handle ccache sstate 'infection' issues

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch sumo
in repository openembedded-core.

commit ee6a2e0ccb11e5f5267bc2e406203c78b0443415
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Aug 10 10:10:15 2018 +0000

    libtool-cross: Handle ccache sstate 'infection' issues
    
    On a system without ccache, f you:
    
    INHERIT += "ccache"
    bitbake libtool-cross
    <remove INHERIT>
    bitbake apmd
    
    then it fails due to being unable to find ccache. The references to ccache are
    coded into libtool-cross but the sstate checksum doesn't reflect this due to the
    way the class is coded (output should be the same regardless).
    
    The simplest solution is to remove references to ccache from the libtool script.
    The output then works regardless of whether ccache is present or not. The
    libtool-cross script is only used in a handful of cases (most of the time its
    dynamically generated by autoconf) so any performance issue is minor.
    
    (From OE-Core rev: ed550a49d2114c56e5bc033ecd0e83073d2d4067)
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
index b268310..522bf3a 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.6.bb
@@ -13,11 +13,19 @@ do_configure_prepend () {
 	rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
 }
 
+#
+# ccache may or may not be INHERITED, we remove references to it so the sstate
+# artefact works on a machine where its not present. libtool-cross isn't used
+# heavily so any performance issue is minor.
+# Find references to LTCC="ccache xxx-gcc" and CC="ccache xxx-gcc"
+#
 do_install () {
 	install -d ${D}${bindir_crossscripts}/
 	install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool
 	sed -e 's@^\(predep_objects="\).*@\1"@' \
 	    -e 's@^\(postdep_objects="\).*@\1"@' \
+	    -e 's@^CC="ccache. at CC="@' \
+	    -e 's@^LTCC="ccache. at LTCC="@' \
 	    -i ${D}${bindir_crossscripts}/${HOST_SYS}-libtool
 	sed -i '/^archive_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/${HOST_SYS}-libtool
 	sed -i '/^archive_expsym_cmds=/s/\-nostdlib//g' ${D}${bindir_crossscripts}/${HOST_SYS}-libtool

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.