From e0af4b2c8f8e29ac6f8eccef401c7c004355359d Mon Sep 17 00:00:00 2001 From: Leonardo Sandoval Date: Wed, 1 Jul 2015 12:57:48 +0000 Subject: gcc-target.inc: Remove non-related gcc headers from include_fixed folder Without this patch, the D's include_fixed folder may change after building it (due to the gcc's fixinc.sh script, executed on the do_compile task) and changes depend on the current sysroot headers, making the gcc's builds non-deterministic. [YOCTO #7882] Signed-off-by: Leonardo Sandoval Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-target.inc | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index c362a0f6b9..6e160c0d1c 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -173,6 +173,37 @@ do_install () { chown -R root:root ${D} } +do_install_append () { + # + # Thefixinc.sh script, run on the gcc's compile phase, looks into sysroot header + # files and places the modified files into + # {D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed folder. This makes the + # build not deterministic. The following code prunes all those headers + # except those under include-fixed/linux, *limits.h and README, yielding + # the same include-fixed folders no matter what sysroot + + include_fixed="${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed" + for f in $(find ${include_fixed} -type f); do + case $f in + */include-fixed/linux/*) + continue + ;; + */include-fixed/*limits.h) + continue + ;; + */include-fixed/README) + continue + ;; + *) + # remove file and directory if empty + bbdebug 2 "Pruning $f" + rm $f + find $(dirname $f) -maxdepth 0 -empty -exec rmdir {} \; + ;; + esac + done +} + # Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross # and one from here. These can confuse gcc cross where includes use #include_next # and builds track file dependencies (e.g. perl and its makedepends code). -- cgit 1.2.3-korg