mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 14:41:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #783 from dm0-/gcc

Browse Source 
Upgrade to GCC 6.4.0
This commit is contained in:
David Michael 2018-01-08 19:35:37 -05:00 committed by GitHub
commit e9a61e9333
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build_library/test_image_content.sh
View File

@ -4,7 +4,6 @@
GLSA_WHITELIST=( GLSA_WHITELIST=(
201412-09 # incompatible CA certificate version numbers 201412-09 # incompatible CA certificate version numbers
201709-02 # updating binutils breaks amd64 Linux uncompression
201710-23 # we handle Go differently; drop when 1.9 builds everything 201710-23 # we handle Go differently; drop when 1.9 builds everything
) )

4
build_library/toolchain_util.sh
View File

@ -194,7 +194,9 @@ get_cross_pkgs() {
# Get portage arguments restricting toolchains to binary packages only. # Get portage arguments restricting toolchains to binary packages only.
get_binonly_args() { get_binonly_args() {
local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") ) local pkgs=( "${TOOLCHAIN_PKGS[@]}" $(get_cross_pkgs "$@") )
echo "${pkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}" # XXX: Revert this after stable > 1632.
local tmppkgs=( ${pkgs[*]##*/binutils} ) ; tmppkgs=( ${tmppkgs[*]##*/gcc} )
echo "${tmppkgs[@]/#/--useoldpkg-atoms=}" "${pkgs[@]/#/--rebuild-exclude=}"
} }
### Toolchain building utilities ### ### Toolchain building utilities ###

3
update_chroot
View File

@ -241,6 +241,9 @@ sudo -E ${EMERGE_CMD} "${EMERGE_FLAGS[@]}" \
coreos-devel/sdk-depends world coreos-devel/sdk-depends world
info "Removing obsolete packages" info "Removing obsolete packages"
# XXX: Remove these next two lines after stable > 1632.
cats=( '<=sys-devel' "${BOARD_CHOSTS[@]/#/<=cross-}" )
sudo -E emerge --quiet --unmerge "${cats[@]/%//binutils-2.29.0}" "${cats[@]/%//gcc-6.3.0}" 2>/dev/null || :
sudo -E ${EMERGE_CMD} --quiet --depclean @unavailable sudo -E ${EMERGE_CMD} --quiet --depclean @unavailable
if portageq list_preserved_libs / >/dev/null; then if portageq list_preserved_libs / >/dev/null; then