From d34694e8440653b19b8c2c6ec57dabf4b923cf60 Mon Sep 17 00:00:00 2001 From: q66 Date: Mon, 11 May 2020 17:08:48 +0200 Subject: [PATCH] llvm10: move clang tools from llvm to clang-tools-extra to decouple This removes the clang dependency from llvm10. --- srcpkgs/llvm10/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/llvm10/template b/srcpkgs/llvm10/template index 441a20345d0..c4ddcf123f1 100644 --- a/srcpkgs/llvm10/template +++ b/srcpkgs/llvm10/template @@ -1,7 +1,7 @@ # Template file for 'llvm10' pkgname=llvm10 version=10.0.0 -revision=1 +revision=2 wrksrc="llvm-${version}.src" build_style=cmake configure_args=" @@ -206,7 +206,12 @@ clang-tools-extra_package() { vmove usr/bin/clang-query vmove usr/bin/clang-rename vmove usr/bin/clang-tidy + vmove usr/bin/diagtool + vmove usr/bin/find-all-symbols + vmove usr/bin/hmaptool vmove usr/bin/modularize + vmove usr/bin/pp-trace + vmove usr/bin/sancov vmove "usr/lib/libclangApplyReplacements*" vmove "usr/lib/libclangQuery*" vmove "usr/lib/libclangTidy*" @@ -216,11 +221,7 @@ clang-tools-extra_package() { clang_package() { lib32disabled=yes - depends="libstdc++-devel libgcc-devel binutils" - case "$XBPS_TARGET_MACHINE" in - *-musl) depends+=" musl-devel";; - *) depends+=" glibc-devel";; - esac + depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel" short_desc+=" - C language family frontend" homepage="https://clang.llvm.org/" pkg_install() {