webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 11:05:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

ccache: update to 4.3 and patch armv6 bus errors

Browse Source 
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
2021-07-01 08:29:39 +02:00
parent 4ff8a22566
commit 97e10fa539
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/ccache
View File

@@ -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) \

14
src/patches/ccache/ccache-4.3-fix_armv6_bus_error.patch Normal file
View File

@@ -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