Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

ccache: Update to 3.3.2

Browse Source
This commit is contained in:
Chocobo1
2016-10-23 19:03:45 +08:00
parent 997472ba7c
commit 36842a48e6
2 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ccache/MSYS2-dont-use-symlinks.patch
View File

@@ -1,36 +1,24 @@
diff -urN ccache-3.2.4.orig/ccache.h ccache-3.2.4/ccache.h
--- ccache-3.2.4.orig/ccache.h 2015-10-08 21:14:23.000000000 +0200
+++ ccache-3.2.4/ccache.h 2016-04-17 19:42:45.063373100 +0200
@@ -248,8 +248,9 @@
diff -urN ccache-3.3.2.orig/ccache.h ccache-3.3.2/ccache.h
--- ccache-3.3.2.orig/ccache.h 2016-09-29 04:44:46.000000000 +0800
+++ ccache-3.3.2/ccache.h 2016-10-23 19:01:12.582863400 +0800
@@ -258,7 +258,7 @@
#endif
/* mkstemp() on some versions of cygwin don't handle binary files, so
- override */
// mkstemp() on some versions of cygwin don't handle binary files, so override.
-#ifdef __CYGWIN__
+ override,
+ however MSYS2 is fine */
+#if defined(__CYGWIN__) && !defined(__MSYS__)
#undef HAVE_MKSTEMP
#endif
diff -urN ccache-3.2.4.orig/lockfile.c ccache-3.2.4/lockfile.c
--- ccache-3.2.4.orig/lockfile.c 2015-10-08 21:14:23.000000000 +0200
+++ ccache-3.2.4/lockfile.c 2016-04-17 19:38:29.151513300 +0200
@@ -36,7 +36,7 @@
char *my_content = NULL, *content = NULL, *initial_content = NULL;
const char *hostname = get_hostname();
bool acquired = false;
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__MSYS__)
const size_t bufsize = 1024;
int fd, len;
#else
@@ -48,7 +48,7 @@
diff -urN ccache-3.3.2.orig/lockfile.c ccache-3.3.2/lockfile.c
--- ccache-3.3.2.orig/lockfile.c 2016-09-29 04:44:46.000000000 +0800
+++ ccache-3.3.2/lockfile.c 2016-10-23 19:01:26.574809400 +0800
@@ -40,7 +40,7 @@
free(my_content);
my_content = format("%s:%d:%d", hostname, (int)getpid(), (int)time(NULL));
-#ifdef _WIN32
+#if defined(_WIN32) || defined(__MSYS__)
fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL|O_BINARY, 0666);
int fd = open(lockfile, O_WRONLY|O_CREAT|O_EXCL|O_BINARY, 0666);
if (fd == -1) {
saved_errno = errno;
int saved_errno = errno;

8
ccache/PKGBUILD
View File

@@ -2,8 +2,8 @@
# Contributor: Renato Silva <br.renatosilva@gmail.com>
pkgname=ccache
pkgver=3.2.5
pkgrel=2
pkgver=3.3.2
pkgrel=1
pkgdesc="A compiler cache (mingw-w64)"
arch=('i686' 'x86_64')
url="https://ccache.samba.org/"
@@ -16,9 +16,9 @@ install="${pkgname}.install"
source=(https://samba.org/ftp/ccache/${pkgname}-${pkgver}.tar.bz2{,.asc}
"MSYS2-dont-use-symlinks.patch")
validpgpkeys=("5A939A71A46792CF57866A51996DDA075594ADB8") #Joel Rosdahl <joel@rosdahl.net>
sha256sums=('7a553809e90faf9de3a23ee9c5b5f786cfd4836bf502744bedb824a24bee1097'
sha256sums=('d2b2033ac351f24e754b27984fd7250074b9eb776d2f9ef96913f20bd5475877'
'SKIP'
'a0d2ea2ef1c9e59d4e5fdd659d291a4c7f4afc48ad50b1bc00f77349337d3167')
'e8f5b1385e5c787df9a7f37d9daaadb0089d85c3a0a69d8d42f82f27f1250338')
prepare() {
cd ${pkgname}-${pkgver}