From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 1 Jul 2021 06:29:39 +0000 (+0200)
Subject: ccache: update to 4.3 and patch armv6 bus errors
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97e10fa5393dc331de6b22078eb0e861ee3e292a;p=people%2Fstevee%2Fipfire-2.x.git

ccache: update to 4.3 and patch armv6 bus errors

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/lfs/ccache b/lfs/ccache
index 9eafad2d8a..b9fba4fdb3 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.1
+VER        = 4.3
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0f95a4b491a4dcd904c8235ee7c660cd
+$(DL_FILE)_MD5 = 10be8f17a25331e42d9dbab4f6c846ab
 
 install : $(TARGET)
 
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ccache/ccache-4.3-fix_armv6_bus_error.patch
 	cd $(DIR_APP) && mkdir -pv build
 	cd $(DIR_APP)/build && cmake \
 		-DCMAKE_INSTALL_PREFIX=$(TOOLS_DIR) \
diff --git a/src/patches/ccache/ccache-4.3-fix_armv6_bus_error.patch b/src/patches/ccache/ccache-4.3-fix_armv6_bus_error.patch
new file mode 100644
index 0000000000..0eb05b5a84
--- /dev/null
+++ b/src/patches/ccache/ccache-4.3-fix_armv6_bus_error.patch
@@ -0,0 +1,14 @@
+diff -Naur ccache-4.3.org/src/third_party/xxhash.h ccache-4.3/src/third_party/xxhash.h
+--- ccache-4.3.org/src/third_party/xxhash.h	2021-05-09 18:39:46.000000000 +0000
++++ ccache-4.3/src/third_party/xxhash.h	2021-06-26 11:48:18.384900728 +0000
+@@ -806,9 +806,7 @@
+  * Prefer these methods in priority order (0 > 1 > 2 > 3)
+  */
+ #ifndef XXH_FORCE_MEMORY_ACCESS   /* can be defined externally, on command line for example */
+-#  if !defined(__clang__) && defined(__GNUC__) && defined(__ARM_FEATURE_UNALIGNED) && defined(__ARM_ARCH) && (__ARM_ARCH == 6)
+-#    define XXH_FORCE_MEMORY_ACCESS 2
+-#  elif !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
++#  if !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
+   (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 7)))
+ #    define XXH_FORCE_MEMORY_ACCESS 1
+ #  endif