From a3c7f9fb416dd29420cc65803f68298d7b1ca6ff Mon Sep 17 00:00:00 2001 From: Henrik Grimler Date: Thu, 2 Sep 2021 15:34:40 +0200 Subject: [PATCH] ccache: do not use hardlinks on android Fixes https://github.com/termux/termux-packages/issues/7454. --- packages/ccache/build.sh | 7 +++++-- packages/ccache/no-hardlink.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 packages/ccache/no-hardlink.patch diff --git a/packages/ccache/build.sh b/packages/ccache/build.sh index 1f4768596..5672c5b2e 100644 --- a/packages/ccache/build.sh +++ b/packages/ccache/build.sh @@ -3,14 +3,17 @@ TERMUX_PKG_DESCRIPTION="Compiler cache for fast recompilation of C/C++ code" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=4.4 +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/ccache/ccache/releases/download/v$TERMUX_PKG_VERSION/ccache-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=b40bea2ecf88fc15d4431f0d5fb8babf018d7218eaded0f40e07d4c18c667561 TERMUX_PKG_DEPENDS="zlib, zstd" #[46/89] Building ASM object src/third_party/blake3/CMakeFiles/blake3.dir/blake3_sse2_x86-64_unix.S.o #FAILED: src/third_party/blake3/CMakeFiles/blake3.dir/blake3_sse2_x86-64_unix.S.o -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DHAVE_ASM_AVX2=FALSE +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +-DHAVE_ASM_AVX2=FALSE -DHAVE_ASM_AVX512=FALSE -DHAVE_ASM_SSE2=FALSE -DHAVE_ASM_SSE41=FALSE --DREDIS_STORAGE_BACKEND=OFF " +-DREDIS_STORAGE_BACKEND=OFF +" diff --git a/packages/ccache/no-hardlink.patch b/packages/ccache/no-hardlink.patch new file mode 100644 index 000000000..932515993 --- /dev/null +++ b/packages/ccache/no-hardlink.patch @@ -0,0 +1,11 @@ +--- ./src/Util.cpp.orig 2021-09-02 13:29:52.824656260 +0000 ++++ ./src/Util.cpp 2021-09-02 13:30:09.431502502 +0000 +@@ -740,7 +740,7 @@ + unlink(newpath.c_str()); + + #ifndef _WIN32 +- if (link(oldpath.c_str(), newpath.c_str()) != 0) { ++ if (symlink(oldpath.c_str(), newpath.c_str()) != 0) { + throw core::Error( + "failed to link {} to {}: {}", oldpath, newpath, strerror(errno)); + }