From b12cc2d4ddf29c5a2f02bddde598beb0b97cc828 Mon Sep 17 00:00:00 2001 From: Jacob Heider Date: Thu, 4 Jan 2024 20:48:26 -0500 Subject: [PATCH] fix(ccache) closes #4669 --- projects/ccache.dev/package.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/projects/ccache.dev/package.yml b/projects/ccache.dev/package.yml index 76672f59..20fe93fa 100644 --- a/projects/ccache.dev/package.yml +++ b/projects/ccache.dev/package.yml @@ -1,5 +1,5 @@ distributable: - url: https://github.com/ccache/ccache/releases/download/v{{version}}/ccache-{{version}}.tar.gz + url: https://github.com/ccache/ccache/releases/download/{{version.tag}}/ccache-{{version.raw}}.tar.gz strip-components: 1 versions: github: ccache/ccache @@ -10,7 +10,8 @@ build: dependencies: asciidoctor.org: '*' cmake.org: '*' - freedesktop.org/pkg-config: '*' + linux: + llvm.org: '*' script: - cmake -S . -B build $CMAKE_ARGS - cmake --build build @@ -25,13 +26,13 @@ build: g++-4.5,g++-4.6,g++-4.7,g++-4.8,g++-4.9,g++-5,g++-6,g++-7,g++-8,g++-9,g++-10,\ g++-11,g++-12,g++-13,i686-w64-mingw32-gcc,i686-w64-mingw32-g++,x86_64-w64-mingw32-gcc,\ x86_64-w64-mingw32-g++" - + IFS=',' read -ra files_array <<< "$files" - + for file in "${files_array[@]}"; do ln -s ../bin/ccache "$file" done - working-directory: "{{prefix}}/libexec" + working-directory: '{{prefix}}/libexec' env: CMAKE_ARGS: - -DCMAKE_INSTALL_PREFIX="{{prefix}} @@ -42,11 +43,14 @@ build: - -Wno-dev - -DBUILD_TESTING=OFF - -DENABLE_IPO=TRUE + linux: + CMAKE_ARGS: + - -DCMAKE_C_COMPILER_AR={{deps.llvm.org.prefix}}/bin/llvm-ar provides: - bin/ccache test: script: - ccache -s - - ccache --version | grep {{version}} + - ccache --version | grep {{version.raw}} - export PATH={{prefix}}/libexec:$PATH - - which clang | grep "{{prefix}}" \ No newline at end of file + - command -v clang | grep "{{prefix}}"