Accepting request 941640 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/941640
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ccache?expand=0&rev=64
This commit is contained in:
Dominique Leuenberger 2021-12-21 17:40:17 +00:00 committed by Git OBS Bridge
commit b18b8054ef
3 changed files with 24 additions and 1 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Dec 17 15:25:36 UTC 2021 - Dirk Müller <dmueller@suse.com>
- add xxhash-avoid-armv6-unaligned-access.patch (bsc#1193317)
-------------------------------------------------------------------
Thu Dec 2 21:57:55 UTC 2021 - Dirk Müller <dmueller@suse.com>

View File

@ -25,6 +25,7 @@ URL: https://ccache.dev/
Source0: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz
Source1: https://github.com/ccache/ccache/releases/download/v%{version}/ccache-%{version}.tar.xz.asc
Source2: %{name}.keyring
Patch1: xxhash-avoid-armv6-unaligned-access.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libzstd-devel >= 1.1.2
@ -38,7 +39,7 @@ being done again. Supported languages are C, C++, Objective-C and
Objective-C++.
%prep
%setup -q
%autosetup -p1
%build
%cmake \

View File

@ -0,0 +1,17 @@
Index: ccache-4.5.1/src/third_party/xxhash.h
===================================================================
--- ccache-4.5.1.orig/src/third_party/xxhash.h
+++ ccache-4.5.1/src/third_party/xxhash.h
@@ -806,10 +806,8 @@ XXH_PUBLIC_API XXH128_hash_t XXH128(cons
* 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)) || \
- (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 7)))
+# if !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
+ (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 6)))
# define XXH_FORCE_MEMORY_ACCESS 1
# endif
#endif