gcc: unify cleanup of include-fixed, apply to cross-canadian
PATCH 1/1 gcc: unify cleanup of include-fixed, apply to cross-canadian
From: Denys Dmytriyenko <[email protected]>
Since target and cross variants were already doing similar cleanup of include-fixed headers, as those aren't used, unify the code and also apply the same to cross-canadian variant.
Some of those header files get processed with a tool that leaves absolute buildpaths inside the file's commented section, causing QA errors. Since those aren't used, let's remove them.
This may be a temporary solution until the tool itself gets fixed to not embed absolute buildpaths in the header files:
https://lists.openembedded.org/g/openembedded-core/topic/107268307
Signed-off-by Denys Dmytriyenko <[email protected]>
Signed-off-by Richard Purdie <[email protected]>
--- meta/recipes-devtools/gcc/gcc-common.inc | 4 +++ .../gcc/gcc-cross-canadian.inc | 2 ++ meta/recipes-devtools/gcc/gcc-cross.inc | 2 +- meta/recipes-devtools/gcc/gcc-target.inc | 31 +------------------ 4 files changed, 8 insertions(+), 31 deletions(-)
meta/recipes-devtools/gcc/gcc-common.inc +4 -0
@@ -138,3 +138,7 @@ remove_sysroot_paths_from_checksum_options () { sed -i "s@${DEBUG_PREFIX_MAP}@@g" ${B}/gcc/checksum-options sed -i "s@$stagingdir@$replacement@g" ${B}/gcc/checksum-options } + +cleanup_installed_include_fixed () { + find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f +}
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +2 -0
@@ -174,6 +174,8 @@ do_install () { done done done + + cleanup_installed_include_fixed } ELFUTILS = "nativesdk-elfutils"
meta/recipes-devtools/gcc/gcc-cross.inc +1 -1
@@ -108,7 +108,7 @@ do_install () { cp ${S}/libquadmath/quadmath.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ cp ${S}/libquadmath/quadmath_weak.h ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include/ - find ${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/include-fixed -type f -not -name "README" -not -name limits.h -not -name syslimits.h | xargs rm -f + cleanup_installed_include_fixed # install LTO linker plugins where binutils tools can find it install -d ${D}${libdir}/bfd-plugins
meta/recipes-devtools/gcc/gcc-target.inc +1 -30
@@ -206,37 +206,8 @@ do_install () { install -d ${D}${libdir}/bfd-plugins ln -sf ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/liblto_plugin.so ${D}${libdir}/bfd-plugins/liblto_plugin.so 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 + cleanup_installed_include_fixed } # Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross