From f6f45be6be6f359dea217a0e91fdeec3cd918e69 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Fri, 7 May 2021 15:24:51 -0700 Subject: [PATCH] ccache: fix compilation with clang Disable testing as it has some linking problem. Signed-off-by: Rosen Penev --- mingw-w64-ccache/010-ucrt.patch | 12 ++++++++++++ mingw-w64-ccache/PKGBUILD | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 mingw-w64-ccache/010-ucrt.patch diff --git a/mingw-w64-ccache/010-ucrt.patch b/mingw-w64-ccache/010-ucrt.patch new file mode 100644 index 0000000000..9d1d202a81 --- /dev/null +++ b/mingw-w64-ccache/010-ucrt.patch @@ -0,0 +1,12 @@ +--- ccache-3.7.9/src/system.h.orig 2020-03-29 16:11:45.000000000 +0200 ++++ ccache-3.7.9/src/system.h 2021-05-09 20:11:02.291660400 +0200 +@@ -55,7 +55,9 @@ + extern int usleep(useconds_t); + #endif + ++#ifndef environ + extern char **environ; ++#endif + + #ifndef ESTALE + #define ESTALE -1 diff --git a/mingw-w64-ccache/PKGBUILD b/mingw-w64-ccache/PKGBUILD index 45405660b5..e02e68a05a 100644 --- a/mingw-w64-ccache/PKGBUILD +++ b/mingw-w64-ccache/PKGBUILD @@ -5,7 +5,7 @@ _realname=ccache pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=3.7.9 -pkgrel=1 +pkgrel=2 pkgdesc="Compiler cache that speeds up recompilation by caching previous compilations (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') @@ -17,15 +17,18 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zlib") options=('staticlibs' 'strip') source=("https://github.com/ccache/ccache/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz"{,.asc} - "01-directory-separator.patch") + "01-directory-separator.patch" + "010-ucrt.patch") sha256sums=('f893da7543bfb9172bd55e603fcbdfcd83e6def176a28689c13235695b4cf44b' 'SKIP' - '888748bd62a23b909dda4df714ffb2bb09db3fa698d199754f372a01b5a55179') + '888748bd62a23b909dda4df714ffb2bb09db3fa698d199754f372a01b5a55179' + '9a569472260674d61e983ae9c617eb5ec90e78b525741a40267b92de0f9f35ae') validpgpkeys=('5A939A71A46792CF57866A51996DDA075594ADB8') # Joel Rosdahl prepare() { cd "${srcdir}/${_realname}-${pkgver}" patch -p1 -i "${srcdir}/01-directory-separator.patch" + patch -p1 -i "${srcdir}/010-ucrt.patch" } build() {