diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/ccache-fix-basedir-test.patch | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/patches/ccache-fix-basedir-test.patch')
| -rw-r--r-- | gnu/packages/patches/ccache-fix-basedir-test.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/ccache-fix-basedir-test.patch b/gnu/packages/patches/ccache-fix-basedir-test.patch new file mode 100644 index 0000000000..c5f6de7780 --- /dev/null +++ b/gnu/packages/patches/ccache-fix-basedir-test.patch @@ -0,0 +1,26 @@ +From ad18f15287b83cee5a45b63e02b31c6a601a134f Mon Sep 17 00:00:00 2001 +From: Tobias Geerinckx-Rice <me@tobias.gr> +Date: Mon, 27 Sep 2021 19:36:30 +0200 +Subject: [PATCH] gnu: ccache: Fix basedir test. + +Applied upstream. +--- + test/suites/basedir.bash | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/suites/basedir.bash b/test/suites/basedir.bash +index 479c632..34e5cb7 100644 +--- a/test/suites/basedir.bash ++++ b/test/suites/basedir.bash +@@ -269,7 +269,7 @@ EOF + EOF + backdate test.h + +- pwd="$(/bin/pwd -P)" ++ pwd="$(pwd -P)" + $REAL_COMPILER -c $pwd/test.c 2>reference.stderr + + CCACHE_ABSSTDERR=1 CCACHE_BASEDIR="$pwd" $CCACHE_COMPILE -c $pwd/test.c 2>ccache.stderr +-- +2.33.0 + |