Unverified Commit 72f5f213 authored by Franz Pletz's avatar Franz Pletz Committed by GitHub
Browse files

Merge pull request #220993 from kira-bruneau/ccache 

ccache: 4.7.4 → 4.8
parents 5fb69031 e34ad7f6

pkgs/development/tools/misc/ccache/default.nix

+30 −26
Original line number Diff line number Diff line
@@ -13,15 +13,15 @@ 
, nix-update-script

}:



let ccache = stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "ccache";

  version = "4.7.4";

  version = "4.8";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    sha256 = "sha256-mt5udwSdzGaspfpAdUavQ55dBeJdhbZjcQpd9xNOQms=";

    owner = "ccache";

    repo = "ccache";

    rev = "refs/tags/v${finalAttrs.version}";

    sha256 = "sha256-X7Pv+yEQaKPdWTiKq67kSAyimyKvLSCYr4EjLlw+J0U=";

  };



  outputs = [ "out" "man" ];
@@ -53,7 +53,8 @@ let ccache = stdenv.mkDerivation rec { 
    bashInteractive

  ] ++ lib.optional stdenv.isDarwin xcodebuild;



  checkPhase = let

  checkPhase =

    let

      badTests = [

        "test.trim_dir" # flaky on hydra (possibly filesystem-specific?)

      ] ++ lib.optionals stdenv.isDarwin [
@@ -61,7 +62,8 @@ let ccache = stdenv.mkDerivation rec { 
        "test.multi_arch"

        "test.nocpp2"

      ];

  in ''

    in

    ''

      runHook preCheck

      export HOME=$(mktemp -d)

      ctest --output-on-failure -E '^(${lib.concatStringsSep "|" badTests})$'
@@ -85,7 +87,7 @@ let ccache = stdenv.mkDerivation rec { 
        wrap() {

          local cname="$1"

          if [ -x "${unwrappedCC}/bin/$cname" ]; then

            makeWrapper ${ccache}/bin/ccache $out/bin/$cname \

            makeWrapper ${finalAttrs.finalPackage}/bin/ccache $out/bin/$cname \

              --run ${lib.escapeShellArg extraConfig} \

              --add-flags ${unwrappedCC}/bin/$cname

          fi
@@ -108,17 +110,19 @@ let ccache = stdenv.mkDerivation rec { 
        done

      '';

    };

  };



  passthru.updateScript = nix-update-script { };

    updateScript = nix-update-script { };

  };



  meta = with lib; {

    description = "Compiler cache for fast recompilation of C/C++ code";

    homepage = "https://ccache.dev";

    downloadPage = "https://ccache.dev/download.html";

    changelog = "https://ccache.dev/releasenotes.html#_ccache_${

      builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version

    }";

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ kira-bruneau r-burns ];

    platforms = platforms.unix;

  };

};

in ccache
 
})

pkgs/development/tools/misc/ccache/force-objdump-on-darwin.patch

+5 −3
Original line number Diff line number Diff line 
diff --git a/test/run b/test/run

index 43a57312..398be8d8 100755

--- a/test/run

+++ b/test/run

@@ -148,21 +148,17 @@ file_size() {
@@ -19,9 +21,9 @@ 
 

 objdump_grep_cmd() {

-    if $HOST_OS_APPLE; then

-        fgrep -q "\"$1\""

-        grep -Fq "\"$1\""

-    elif $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then

+    if $HOST_OS_WINDOWS || $HOST_OS_CYGWIN; then

         fgrep -q "$1"

         grep -Fq "$1"

     else

         fgrep -q ": $1"
 
         grep -Fq ": $1"