ccache: update to 3.4.2 (#4224)

This commit is contained in:
Andrew Sun
2018-08-18 02:25:22 -04:00
committed by Алексей
parent ecb37ea8bb
commit 8b5ea68231
2 changed files with 18 additions and 31 deletions

View File

@@ -1,8 +1,7 @@
diff --git a/src/ccache.c b/src/ccache.c
index 9dfdbfc..4d87dd0 100644
--- a/src/ccache.c
+++ b/src/ccache.c
@@ -872,6 +872,13 @@ process_preprocessed_file(struct mdfour *hash, const char *path, bool pump)
diff -Naur ccache-3.4.2.orig/src/ccache.c ccache-3.4.2/src/ccache.c
--- ccache-3.4.2.orig/src/ccache.c 2018-08-16 17:13:29.359895100 -0400
+++ ccache-3.4.2/src/ccache.c 2018-08-16 17:15:51.861247500 -0400
@@ -855,6 +855,13 @@
}
// p and q span the include file path.
char *inc_path = x_strndup(p, q - p);
@@ -16,20 +15,10 @@ index 9dfdbfc..4d87dd0 100644
if (!has_absolute_include_headers) {
has_absolute_include_headers = is_absolute_path(inc_path);
}
@@ -1444,7 +1451,7 @@ get_object_name_from_cpp(struct args *args, struct mdfour *hash)
}
hash_delimiter(hash, "cppstderr");
- if (!hash_file(hash, path_stderr)) {
+ if (!direct_i_file && !hash_file(hash, path_stderr)) {
fatal("Failed to open %s: %s", path_stderr, strerror(errno));
}
diff --git a/src/ccache.h b/src/ccache.h
index dec11fa..f6943ac 100644
--- a/src/ccache.h
+++ b/src/ccache.h
@@ -188,6 +188,7 @@ bool read_file(const char *path, size_t size_hint, char **data, size_t *size);
diff -Naur ccache-3.4.2.orig/src/ccache.h ccache-3.4.2/src/ccache.h
--- ccache-3.4.2.orig/src/ccache.h 2018-08-16 17:13:29.359895100 -0400
+++ ccache-3.4.2/src/ccache.h 2018-08-16 17:16:22.361150900 -0400
@@ -199,6 +199,7 @@
char *read_text_file(const char *path, size_t size_hint);
char *subst_env_in_string(const char *str, char **errmsg);
void set_cloexec_flag(int fd);
@@ -37,11 +26,10 @@ index dec11fa..f6943ac 100644
// ----------------------------------------------------------------------------
// stats.c
diff --git a/src/util.c b/src/util.c
index b89a33e..d554ecc 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1097,6 +1097,13 @@ x_realpath(const char *path)
diff -Naur ccache-3.4.2.orig/src/util.c ccache-3.4.2/src/util.c
--- ccache-3.4.2.orig/src/util.c 2018-08-16 17:13:29.344270000 -0400
+++ ccache-3.4.2/src/util.c 2018-08-16 17:19:32.688548500 -0400
@@ -1097,6 +1097,13 @@
} else {
snprintf(ret, maxlen, "%s", path);
p = ret;
@@ -55,7 +43,7 @@ index b89a33e..d554ecc 100644
}
#else
// Yes, there are such systems. This replacement relies on the fact that when
@@ -1286,11 +1293,17 @@ common_dir_prefix_length(const char *s1, const char *s2)
@@ -1286,11 +1293,17 @@
const char *p1 = s1;
const char *p2 = s2;
@@ -74,8 +62,8 @@ index b89a33e..d554ecc 100644
p1--;
p2--;
}
@@ -1671,3 +1684,36 @@ set_cloexec_flag(int fd)
}
@@ -1688,3 +1701,36 @@
(void)fd;
#endif
}
+
@@ -111,4 +99,3 @@ index b89a33e..d554ecc 100644
+ // write altered string back to target
+ strcpy(target, buffer);
+}
\ No newline at end of file

View File

@@ -4,7 +4,7 @@
_realname=ccache
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=3.4.1
pkgver=3.4.2
pkgrel=1
pkgdesc="A compiler cache (mingw-w64)"
arch=('any')
@@ -17,9 +17,9 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
options=('staticlibs' 'strip')
source=(https://www.samba.org/ftp/ccache/${_realname}-${pkgver}.tar.bz2{,.asc}
01-directory-separator.patch)
sha256sums=('ca5a01fb4868cdb5176c77b8b4a390be7929a6064be80741217e0686f03f8389'
sha256sums=('3aa5587793d4c790bd22999bfc678250c029307b3afb9d16f6f4a49c67b78fb3'
'SKIP'
'6b0f25d2bab156388d5c96ace405c15f7c685267064d6a3e13595979644cbc39')
'b6af582fb3d7d8d9eff8263bb49aa6cd5f1d998787200e5fa3304134884e0d4c')
validpgpkeys=('5A939A71A46792CF57866A51996DDA075594ADB8') # Joel Rosdahl <joel@rosdahl.net>
prepare() {