From 6d214f929c974f6c07d44e3a36c212ef3d334287 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 26 Jan 2020 20:01:15 +0000 Subject: [PATCH] toolchain.eclass: don't add _pre suffixes to tools ${GCC_CONFIG_VER} != ${GCC_RELEASE_VER} does not really work today. We don't override enough paths and don't rename tool versions. Let's keep thins simpler and stick to upstream versioning. Signed-off-by: Sergei Trofimovich --- eclass/toolchain.eclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 97c9e585723e..767240eb7f23 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -73,9 +73,10 @@ GCCMAJOR=$(ver_cut 1 ${GCC_PV}) GCCMINOR=$(ver_cut 2 ${GCC_PV}) GCCMICRO=$(ver_cut 3 ${GCC_PV}) -# According to gcc/c-cppbuiltin.c, GCC_CONFIG_VER MUST match this regex. -# ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)? -GCC_CONFIG_VER=${GCC_CONFIG_VER:-$(ver_rs 3 '-' ${GCC_PV})} +# gcc hardcodes it's internal version into gcc/BASE-VER +# and assumes various directories and tools to have the +# same name. +GCC_CONFIG_VER=${GCC_RELEASE_VER} # Pre-release support. Versioning schema: # 1.0.0_pre9999: live ebuild -- 2.26.2