From 1076894c62c0e0fffa4bbe6e5478cbc250c41f5f Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 14 Feb 2023 13:15:24 +0100 Subject: [PATCH] profiles: update sys-devel/gcc to 11.3.1_p20230120-r1 Since the new USE flag `cet` became the default in profiles of portage-stable, SDK bootstrap using gcc 11.3.1_p20221209 started to fail at `sys-libs/glibc`. ``` in function `dl_open_worker_begin': dl-open.c:(.text+0xab4c): undefined reference to `_dl_cet_open_check' ``` That is because gcc is not correctly configured for CET. That issue was fixed in recent upstream GCC versions, e.g. 11.3.1_p20221209-r1 or 11.3.1_p20230120-r1. https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=016184c289f2cc6c6ade496a700a12f135fbae07 https://gitweb.gentoo.org/proj/gcc-patches.git/commit/?id=15daf0510a5fab17cd556261d688a6618391a0c1 However, gcc of Flatcar, 11.3.1_p20221209, does not have the fix. Update sys-devel/gcc to 11.3.1_p20230120-r1 to fix that issue. Also accept ~arm64 to keep the same version for both arches. --- .../profiles/coreos/arm64/package.accept_keywords | 4 ++++ .../coreos-overlay/profiles/coreos/base/package.mask | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 9c9902f00b..cbf3bd6b3c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -34,6 +34,10 @@ # needed to force enable ipvsadm for arm64 =sys-cluster/ipvsadm-1.27-r1 ** +# needed to enable gcc 11.3.1_p20230120-r1 for arm64, a required version +# for fixing build issues in glibc with gcc, w.r.t USE flag cet. +=sys-devel/gcc-11.3.1_p20230120-r1 ~arm64 + =sys-firmware/edk2-aarch64-18.02 ** =sys-fs/btrfs-progs-4.19.1 ~arm64 =sys-libs/libselinux-3.1-r2 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 68d088c019..783cb56b97 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -22,7 +22,7 @@ # up. Drop this when we switch to it. >=dev-lang/python-3.10 -# sys-devel/gcc-11.3.1_p20221209 is the latest gcc version that is -# stable on both amd64 and arm64. There are newer versions of gcc -# which are stable only on one of them, so mask them. ->sys-devel/gcc-11.3.1_p20221209 +# sys-devel/gcc-11.3.1_p20230120-r1 is the latest stable gcc version +# that fixes the CET build issue of glibc. There are newer versions of +# gcc that are not tested enough for CET, so mask them. +>sys-devel/gcc-11.3.1_p20230120-r1