From a044c2b606e7352e0b268ad9a5a6480311e696409663bcc8bc2dfd79ac0c51bb Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Tue, 6 Jul 2021 15:44:57 +0000
Subject: [PATCH] Accepting request 904411 from home:oertel:branches:science

- add patch xxhash-avoid-armv6-unaligned-access.patch
  do not expect unaligned accesses to work on armv6, it breaks
  in our build setup using aarch64 kernels

OBS-URL: https://build.opensuse.org/request/show/904411
OBS-URL: https://build.opensuse.org/package/show/science/xxhash?expand=0&rev=14
---
 xxhash-avoid-armv6-unaligned-access.patch | 11 +++++++++++
 xxhash.changes                            |  7 +++++++
 xxhash.spec                               |  6 ++++--
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 xxhash-avoid-armv6-unaligned-access.patch

diff --git a/xxhash-avoid-armv6-unaligned-access.patch b/xxhash-avoid-armv6-unaligned-access.patch
new file mode 100644
index 0000000..5f1c410
--- /dev/null
+++ b/xxhash-avoid-armv6-unaligned-access.patch
@@ -0,0 +1,11 @@
+--- xxHash-0.8.0/xxhash.h	2021/07/06 15:14:04	1.1
++++ xxHash-0.8.0/xxhash.h	2021/07/06 15:14:36
+@@ -807,7 +807,7 @@
+  */
+ #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
++#    define XXH_FORCE_MEMORY_ACCESS 1
+ #  elif !defined(__clang__) && ((defined(__INTEL_COMPILER) && !defined(_WIN32)) || \
+   (defined(__GNUC__) && (defined(__ARM_ARCH) && __ARM_ARCH >= 7)))
+ #    define XXH_FORCE_MEMORY_ACCESS 1
diff --git a/xxhash.changes b/xxhash.changes
index 8f04569..92a4a19 100644
--- a/xxhash.changes
+++ b/xxhash.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jul  6 17:15:34 CEST 2021 - ro@suse.de
+
+- add patch xxhash-avoid-armv6-unaligned-access.patch
+  do not expect unaligned accesses to work on armv6, it breaks
+  in our build setup using aarch64 kernels 
+
 -------------------------------------------------------------------
 Mon Aug  3 05:43:31 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 
diff --git a/xxhash.spec b/xxhash.spec
index 7d31c5a..27c3454 100644
--- a/xxhash.spec
+++ b/xxhash.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xxhash
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -20,10 +20,11 @@ Name:           xxhash
 Version:        0.8.0
 Release:        0
 Summary:        Non-cryptographic hash algorithm
-License:        GPL-2.0-only AND BSD-2-Clause
+License:        BSD-2-Clause AND GPL-2.0-only
 Group:          Productivity/Security
 URL:            https://github.com/Cyan4973/xxHash
 Source0:        https://github.com/Cyan4973/xxHash/archive/v%{version}.tar.gz#/xxHash-%{version}.tar.gz
+Patch0:         xxhash-avoid-armv6-unaligned-access.patch
 BuildRequires:  c++_compiler
 BuildRequires:  pkgconfig
 
@@ -56,6 +57,7 @@ functions. Hashes are identical on all platforms.
 
 %prep
 %setup -q -n xxHash-%{version}
+%patch0 -p1
 
 %build
 make %{?_smp_mflags} prefix=%{_prefix} libdir=%{_libdir}