Update to 3.7.9
This commit is contained in:
parent
61aac70249
commit
14892db16d
1
.gitignore
vendored
1
.gitignore
vendored
@ -4,3 +4,4 @@
|
||||
/ccache-3.7.6.tar.gz
|
||||
/ccache-3.7.7.tar.gz
|
||||
/ccache-3.7.8.tar.gz
|
||||
/ccache-3.7.9.tar.gz
|
||||
|
@ -1,38 +0,0 @@
|
||||
From 0b1a0d78bfaac9321fc077464002bd42e6f15e5e Mon Sep 17 00:00:00 2001
|
||||
From: Joel Rosdahl <joel@rosdahl.net>
|
||||
Date: Tue, 24 Mar 2020 21:33:56 +0100
|
||||
Subject: [PATCH] Remove incorrect result check in `format`
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
`format` considers a zero-length result (e.g. from `format("%s", "")`)
|
||||
to be a fatal error. The check originates from 0a7cea64 where it was
|
||||
appropriate but become incorrect later when refactoring the original
|
||||
`x_asprintf2` function to `format`.
|
||||
|
||||
I can’t find any call to `format` that would trigger this edge case, but
|
||||
let’s remove the erroneous check anyway.
|
||||
|
||||
Related to #568.
|
||||
---
|
||||
src/util.c | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/src/util.c b/src/util.c
|
||||
index b6cce75..0fd3f0f 100644
|
||||
--- a/src/util.c
|
||||
+++ b/src/util.c
|
||||
@@ -703,9 +703,6 @@ format(const char *format, ...)
|
||||
}
|
||||
va_end(ap);
|
||||
|
||||
- if (!*ptr) {
|
||||
- fatal("Internal error in format");
|
||||
- }
|
||||
return ptr;
|
||||
}
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
@ -12,7 +12,7 @@
|
||||
%global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
|
||||
|
||||
Name: ccache
|
||||
Version: 3.7.8
|
||||
Version: 3.7.9
|
||||
Release: 1%{?dist}
|
||||
Summary: C/C++ compiler cache
|
||||
|
||||
@ -22,9 +22,6 @@ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/%
|
||||
Source1: %{name}.sh.in
|
||||
Source2: %{name}.csh.in
|
||||
|
||||
# Fix AOSP build error: See https://github.com/ccache/ccache/issues/568
|
||||
Patch0: 0001-Remove-incorrect-result-check-in-format.patch
|
||||
|
||||
BuildRequires: perl(File::Spec)
|
||||
BuildRequires: zlib-devel >= 1.2.3
|
||||
# clang for additional tests
|
||||
@ -43,7 +40,6 @@ being done again. The main focus is to handle the GNU C/C++ compiler
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
|
||||
%{SOURCE1} > %{name}.sh
|
||||
sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
|
||||
@ -219,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 30 2020 LuK1337 <priv.luk@gmail.com> - 3.7.9-1
|
||||
- Update to 3.7.9
|
||||
|
||||
* Thu Mar 26 2020 LuK1337 <priv.luk@gmail.com> - 3.7.8-1
|
||||
- Update to 3.7.8
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (ccache-3.7.8.tar.gz) = 1de67ddf453dd8d46d33d82c120107e915da32cb0f96e8554f159203f60ebe9695c1bde9145294048520c4c562149a050b9d687901582bafb4d55e0d635a609e
|
||||
SHA512 (ccache-3.7.9.tar.gz) = c5af4dcbd0d0b768700780ad0706abb94bffe333fa6f1801de19aa925f3d33e3206d4bd96561ed9e8ce3761dfa8a2bb380c346d1638c030b82afd8c3ce3d8817
|
||||
|
Loading…
Reference in New Issue
Block a user