From e621d36783ba0760925a62dd23c71495436fe753 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Feb 2024 05:40:04 +0000 Subject: gentoo auto-resync : 22:02:2024 - 05:40:04 --- eclass/Manifest.gz | Bin 39769 -> 39766 bytes eclass/llvm.org.eclass | 12 ++++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'eclass') diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz index dbe6cc33cfbf..a167dd103765 100644 Binary files a/eclass/Manifest.gz and b/eclass/Manifest.gz differ diff --git a/eclass/llvm.org.eclass b/eclass/llvm.org.eclass index 25316f0d65e9..de07fecea8e1 100644 --- a/eclass/llvm.org.eclass +++ b/eclass/llvm.org.eclass @@ -205,10 +205,14 @@ ALL_LLVM_TARGET_FLAGS=( # @OUTPUT_VARIABLE # @DESCRIPTION: # The current ABI version of LLVM dylib, in a form suitable for use -# as a subslot. This is equal to LLVM_MAJOR for releases, and to PV -# for the main branch. -LLVM_SOABI=${LLVM_MAJOR} -[[ ${LLVM_MAJOR} == ${_LLVM_MAIN_MAJOR} ]] && LLVM_SOABI=${PV} +# as a subslot. +if [[ ${LLVM_MAJOR} == ${_LLVM_MAIN_MAJOR} ]]; then + LLVM_SOABI=${PV} +elif ver_test ${PV} -ge 18.1.0_rc3; then + LLVM_SOABI=$(ver_cut 1-2) +else + LLVM_SOABI=${LLVM_MAJOR} +fi # == global scope logic == -- cgit v1.2.3