From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 615F8158020 for ; Sat, 24 Dec 2022 20:16:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4DDAE07E2; Sat, 24 Dec 2022 20:16:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B99D6E07E2 for ; Sat, 24 Dec 2022 20:16:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9CA04340CB8 for ; Sat, 24 Dec 2022 20:16:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B50537ED for ; Sat, 24 Dec 2022 20:16:08 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1671912964.46d18cd145b4fc1c0c179d70b81974334d3623a3.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/, eclass/tests/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/llvm.eclass eclass/tests/llvm.sh X-VCS-Directories: eclass/tests/ eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 46d18cd145b4fc1c0c179d70b81974334d3623a3 X-VCS-Branch: master Date: Sat, 24 Dec 2022 20:16:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f9d6403-40de-463c-94d7-5ee59a729804 X-Archives-Hash: 6e1c28926d8f9b07f2453d4fbb8d1b58 commit: 46d18cd145b4fc1c0c179d70b81974334d3623a3 Author: Michał Górny gentoo org> AuthorDate: Tue Dec 13 03:48:48 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Dec 24 20:16:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d18cd1 llvm.eclass: Remove EAPI 6 Signed-off-by: Michał Górny gentoo.org> eclass/llvm.eclass | 43 ++++++++----------------------------------- eclass/tests/llvm.sh | 7 ------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/eclass/llvm.eclass b/eclass/llvm.eclass index 7657de4bc5a2..b4347163face 100644 --- a/eclass/llvm.eclass +++ b/eclass/llvm.eclass @@ -6,7 +6,7 @@ # Michał Górny # @AUTHOR: # Michał Górny -# @SUPPORTED_EAPIS: 6 7 8 +# @SUPPORTED_EAPIS: 7 8 # @BLURB: Utility functions to build against slotted LLVM # @DESCRIPTION: # The llvm.eclass provides utility functions that can be used to build @@ -56,15 +56,9 @@ # } # @CODE -case "${EAPI:-0}" in - 0|1|2|3|4|5) - die "Unsupported EAPI=${EAPI:-0} (too old) for ${ECLASS}" - ;; - 6|7|8) - ;; - *) - die "Unsupported EAPI=${EAPI} (unknown) for ${ECLASS}" - ;; +case ${EAPI} in + 7|8) ;; + *) die "EAPI=${EAPI:-0} not supported";; esac EXPORT_FUNCTIONS pkg_setup @@ -95,7 +89,7 @@ declare -g -r _LLVM_KNOWN_SLOTS=( {16..8} ) # # If -b is specified, the checks are performed relative to BROOT, # and BROOT-path is returned. This is appropriate when your package -# calls llvm-config executable. -b is supported since EAPI 7. +# calls llvm-config executable. # # If -d is specified, the checks are performed relative to ESYSROOT, # and ESYSROOT-path is returned. This is appropriate when your package @@ -126,17 +120,6 @@ get_llvm_slot() { shift done - if [[ ${EAPI} == 6 ]]; then - case ${hv_switch} in - -b) - die "${FUNCNAME} -b is not supported in EAPI ${EAPI}" - ;; - -d) - hv_switch= - ;; - esac - fi - local max_slot=${1} local slot for slot in "${_LLVM_KNOWN_SLOTS[@]}"; do @@ -179,17 +162,8 @@ get_llvm_slot() { get_llvm_prefix() { debug-print-function ${FUNCNAME} "${@}" - local prefix=${EPREFIX} - if [[ ${EAPI} != 6 ]]; then - case ${1} in - -b) - prefix=${BROOT} - ;; - *) - prefix=${ESYSROOT} - ;; - esac - fi + local prefix=${ESYSROOT} + [[ ${1} == -b ]] && prefix=${BROOT} echo "${prefix}/usr/lib/llvm/$(get_llvm_slot "${@}")" } @@ -277,8 +251,7 @@ llvm_pkg_setup() { llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB llvm_fix_tool_path READELF STRINGS STRIP - local prefix=${EPREFIX} - [[ ${EAPI} != 6 ]] && prefix=${ESYSROOT} + local prefix=${ESYSROOT} local llvm_path=${prefix}/usr/lib/llvm/${LLVM_SLOT}/bin local IFS=: local split_path=( ${PATH} ) diff --git a/eclass/tests/llvm.sh b/eclass/tests/llvm.sh index 93bc124a82af..e62fb4b002a2 100755 --- a/eclass/tests/llvm.sh +++ b/eclass/tests/llvm.sh @@ -74,13 +74,6 @@ eindent check_prefix /sysroot/eprefix/usr/lib/llvm/11 -d eoutdent -ebegin "Testing check_setup_path EAPI 6 API" -eindent - EAPI=6 \ - LLVM_INSTALLED_SLOT=11 \ - check_prefix /usr/lib/llvm/11 -d -eoutdent - BASEPATH=/usr/lib/ccache/bin:/usr/bin:/usr/sbin:/bin:/sbin # TODO: cross support?