MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

gcc: remove paths to sysroot from configargs.h and checksum-options for gcc-cross-canadian

Browse Source 
Apply fixes from gcc-cross (84a78f46d594 and 0ead8cbdfb96) to gcc-cross-canadian.
This will improve (but not fix) reproducibility of gcc-cross-canadian.
Also move this code to functions to avoid code duplication.

[RP: Tweak patch to make the function parameters clear and fix quoting issues
ensuring the code exactly matches the original replacements with an additional
parameter.]

(From OE-Core rev: 350ff7d53f7506de2bc01f0efc569b8294b9afea)

Signed-off-by: Oleksandr Hnatiuk <ohnatiuk@cisco.com>
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Oleksandr Hnatiuk 2024-07-22 01:34:58 -04:00 committed by Richard Purdie
parent ee83d0fdae
commit f1ad5be433
5 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/recipes-devtools/gcc/gcc-common.inc
View File

@ -116,3 +116,25 @@ target_prefix ?= "${prefix}"
# The real WORKDIR location isn't a dependency for the shared workdir. # The real WORKDIR location isn't a dependency for the shared workdir.
src_patches[vardepsexclude] = "WORKDIR" src_patches[vardepsexclude] = "WORKDIR"
should_apply[vardepsexclude] += "PN" should_apply[vardepsexclude] += "PN"
remove_sysroot_paths_from_configargs () {
replacement=${1}
# Prevent sysroot path from being used in configargs.h header, as it will
# be rewritten when used by other sysroots preventing support for gcc
# plugins. Additionally the path is embeddeded into the output binary, this
# prevents building a reproducible binary.
oe_runmake configure-gcc
sed -i "s@${STAGING_DIR_TARGET}@$replacement@g" ${B}/gcc/configargs.h
sed -i "s@${STAGING_DIR_HOST}@/$replacement@g" ${B}/gcc/configargs.h
}
remove_sysroot_paths_from_checksum_options () {
stagingdir=${1}
replacement=${2}
# Prevent sysroot/workdir paths from being used in checksum-options.
# checksum-options is used to generate a checksum which is embedded into
# the output binary.
oe_runmake TARGET-gcc=checksum-options all-gcc
sed -i "s@${DEBUG_PREFIX_MAP}@@g" ${B}/gcc/checksum-options
sed -i "s@$stagingdir@$replacement@g" ${B}/gcc/checksum-options
}

1
meta/recipes-devtools/gcc/gcc-configure-common.inc
View File

@ -119,4 +119,3 @@ do_configure () {
oe_runconf oe_runconf
} }

3
meta/recipes-devtools/gcc/gcc-cross-canadian.inc
View File

@ -64,6 +64,9 @@ do_configure () {
} }
do_compile () { do_compile () {
remove_sysroot_paths_from_configargs '/host'
remove_sysroot_paths_from_checksum_options '${STAGING_DIR_HOST}' '/host'
oe_runmake all-host configure-target-libgcc oe_runmake all-host configure-target-libgcc
(cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h) (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)
} }

15
meta/recipes-devtools/gcc/gcc-cross.inc
View File

@ -63,19 +63,8 @@ do_compile () {
export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}" export CXXFLAGS_FOR_TARGET="${TARGET_CXXFLAGS}"
export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}" export LDFLAGS_FOR_TARGET="${TARGET_LDFLAGS}"
# Prevent native/host sysroot path from being used in configargs.h header, remove_sysroot_paths_from_configargs '/host'
# as it will be rewritten when used by other sysroots preventing support remove_sysroot_paths_from_checksum_options '${STAGING_DIR_HOST}' '/host'
# for gcc plugins
oe_runmake configure-gcc
sed -i 's@${STAGING_DIR_TARGET}@/host@g' ${B}/gcc/configargs.h
sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/configargs.h
# Prevent sysroot/workdir paths from being used in checksum-options.
# checksum-options is used to generate a checksum which is embedded into
# the output binary.
oe_runmake TARGET-gcc=checksum-options all-gcc
sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options
sed -i 's@${STAGING_DIR_HOST}@/host@g' ${B}/gcc/checksum-options
oe_runmake all-host configure-target-libgcc oe_runmake all-host configure-target-libgcc
(cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h) (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h)

16
meta/recipes-devtools/gcc/gcc-target.inc
View File

@ -132,20 +132,8 @@ FILES:${PN}-doc = "\
" "
do_compile () { do_compile () {
# Prevent full target sysroot path from being used in configargs.h header, remove_sysroot_paths_from_configargs '/'
# as it will be rewritten when used by other sysroots preventing support remove_sysroot_paths_from_checksum_options '${STAGING_DIR_TARGET}' '/'
# for gcc plugins. Additionally the path is embeddeded into the output
# binary, this prevents building a reproducible binary.
oe_runmake configure-gcc
sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/configargs.h
sed -i 's@${STAGING_DIR_HOST}@/@g' ${B}/gcc/configargs.h
# Prevent sysroot/workdir paths from being used in checksum-options.
# checksum-options is used to generate a checksum which is embedded into
# the output binary.
oe_runmake TARGET-gcc=checksum-options all-gcc
sed -i 's@${DEBUG_PREFIX_MAP}@@g' ${B}/gcc/checksum-options
sed -i 's@${STAGING_DIR_TARGET}@/@g' ${B}/gcc/checksum-options
oe_runmake all-host oe_runmake all-host
} }