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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 863631382C5 for ; Sat, 7 Apr 2018 21:29:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6118E0961; Sat, 7 Apr 2018 21:29:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4163E0961 for ; Sat, 7 Apr 2018 21:29:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9D12C335C0A for ; Sat, 7 Apr 2018 21:29:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D53F7272 for ; Sat, 7 Apr 2018 21:29:53 +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: <1523136588.c5a58952083aa9392b1944ec73942494a2440198.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang/clang-9999.ebuild X-VCS-Directories: sys-devel/clang/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c5a58952083aa9392b1944ec73942494a2440198 X-VCS-Branch: master Date: Sat, 7 Apr 2018 21:29:53 +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-Archives-Salt: 1efe0071-c6de-4db5-9079-b334a09f5c31 X-Archives-Hash: 686a6ecb655620941ed11cd8295937e3 commit: c5a58952083aa9392b1944ec73942494a2440198 Author: Michał Górny gentoo org> AuthorDate: Sat Apr 7 21:04:52 2018 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Apr 7 21:29:48 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5a58952 sys-devel/clang: Update for clang-X naming in -9999 Upstream has removed the minor version from clang symlink in git. Update our code accordingly. sys-devel/clang/clang-9999.ebuild | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild index 8bc9b08cc45..0ece5c80216 100644 --- a/sys-devel/clang/clang-9999.ebuild +++ b/sys-devel/clang/clang-9999.ebuild @@ -219,19 +219,19 @@ src_install() { # Apply CHOST and version suffix to clang tools # note: we use two version components here (vs 3 in runtime path) local llvm_version=$(llvm-config --version) || die - local clang_version=$(ver_cut 1-2 "${llvm_version}") + local clang_version=$(ver_cut 1 "${llvm_version}") local clang_full_version=$(ver_cut 1-3 "${llvm_version}") local clang_tools=( clang clang++ clang-cl clang-cpp ) local abi i # cmake gives us: - # - clang-X.Y - # - clang -> clang-X.Y + # - clang-X + # - clang -> clang-X # - clang++, clang-cl, clang-cpp -> clang # we want to have: - # - clang-X.Y - # - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y - # - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y + # - clang-X + # - clang++-X, clang-cl-X, clang-cpp-X -> clang-X + # - clang, clang++, clang-cl, clang-cpp -> clang*-X # also in CHOST variant for i in "${clang_tools[@]:1}"; do rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die