Accepting request 517991 from home:smithfarm:branches:devel:libraries:c_c++

Add patch ported from SLE OBS-URL: https://build.opensuse.org/request/show/517991 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/leveldb?expand=0&rev=22
2017-08-21 22:54:15 +00:00 · 2017-08-21 22:54:15 +00:00 · dc7af662ff
commit dc7af662ff
parent 69d11ef502
3 changed files with 219 additions and 0 deletions
--- a/0001-debian-ports.patch
+++ b/0001-debian-ports.patch
@ -0,0 +1,208 @@
+diff --git a/port/atomic_pointer.h b/port/atomic_pointer.h
+index 1c4c7aa..c2c34b1 100644
+--- a/port/atomic_pointer.h
+++ b/port/atomic_pointer.h
+@@ -41,6 +41,18 @@
+ #define ARCH_CPU_PPC_FAMILY 1
+ #elif defined(__mips__)
+ #define ARCH_CPU_MIPS_FAMILY 1
+#elif defined(__ia64__)
+#define ARCH_CPU_IA64_FAMILY 1
+#elif defined(__alpha__)
+#define ARCH_CPU_ALPHA_FAMILY 1
+#elif defined(__s390x__) || defined(__s390__)
+#define ARCH_CPU_S390_FAMILY 1
+#elif defined(__sparc__) || defined(__sparc64__)
+#define ARCH_CPU_SPARC_FAMILY 1
+#elif defined(__sh__)
+#define ARCH_CPU_SH_FAMILY 1
+#elif defined(__hppa__) || defined(__parisc__)
+#define ARCH_CPU_PARISC_FAMILY 1
+ #endif
+ 
+ namespace leveldb {
+@@ -55,14 +67,25 @@ namespace port {
+ 
+ // Mac OS
+ #elif defined(OS_MACOSX)
+-inline void MemoryBarrier() {
+inline void ReadMemoryBarrier() {
+  OSMemoryBarrier();
+}
+inline void WriteMemoryBarrier() {
+   OSMemoryBarrier();
+ }
+ #define LEVELDB_HAVE_MEMORY_BARRIER
+ 
+#define ReadMemoryBarrier MemoryBarrier()
+#define WriteMemoryBarrier MemoryBarrier()
+
+ // Gcc on x86
+ #elif defined(ARCH_CPU_X86_FAMILY) && defined(__GNUC__)
+-inline void MemoryBarrier() {
+inline void ReadMemoryBarrier() {
+  // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on
+  // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering.
+  __asm__ __volatile__("" : : : "memory");
+}
+inline void WriteMemoryBarrier() {
+   // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on
+   // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering.
+   __asm__ __volatile__("" : : : "memory");
+@@ -71,7 +94,12 @@ inline void MemoryBarrier() {
+ 
+ // Sun Studio
+ #elif defined(ARCH_CPU_X86_FAMILY) && defined(__SUNPRO_CC)
+-inline void MemoryBarrier() {
+inline void ReadMemoryBarrier() {
+  // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on
+  // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering.
+  asm volatile("" : : : "memory");
+}
+inline void WriteMemoryBarrier() {
+   // See http://gcc.gnu.org/ml/gcc/2003-04/msg01180.html for a discussion on
+   // this idiom. Also see http://en.wikipedia.org/wiki/Memory_ordering.
+   asm volatile("" : : : "memory");
+@@ -91,24 +119,109 @@ typedef void (*LinuxKernelMemoryBarrierFunc)(void);
+ // shows that the extra function call cost is completely negligible on
+ // multi-core devices.
+ //
+-inline void MemoryBarrier() {
+inline void ReadMemoryBarrier() {
+  (*(LinuxKernelMemoryBarrierFunc)0xffff0fa0)();
+}
+inline void WriteMemoryBarrier() {
+   (*(LinuxKernelMemoryBarrierFunc)0xffff0fa0)();
+ }
+ #define LEVELDB_HAVE_MEMORY_BARRIER
+ 
+ // ARM64
+ #elif defined(ARCH_CPU_ARM64_FAMILY)
+-inline void MemoryBarrier() {
+inline void ReadMemoryBarrier() {
+  asm volatile("dmb sy" : : : "memory");
+}
+inline void WriteMemoryBarrier() {
+   asm volatile("dmb sy" : : : "memory");
+ }
+ #define LEVELDB_HAVE_MEMORY_BARRIER
+ 
+ // PPC
+ #elif defined(ARCH_CPU_PPC_FAMILY) && defined(__GNUC__)
+-inline void MemoryBarrier() {
+-  // TODO for some powerpc expert: is there a cheaper suitable variant?
+-  // Perhaps by having separate barriers for acquire and release ops.
+-  asm volatile("sync" : : : "memory");
+
+inline void ReadMemoryBarrier() {
+#ifdef __powerpc64__
+  __asm__ __volatile__ ("lwsync" : : : "memory");
+#else
+  __asm__ __volatile__ ("sync" : : : "memory");
+#endif
+}
+inline void WriteMemoryBarrier() {
+  __asm__ __volatile__ ("sync" : : : "memory");
+}
+#define LEVELDB_HAVE_MEMORY_BARRIER
+
+// IA64
+#elif defined(ARCH_CPU_IA64_FAMILY)
+inline void ReadMemoryBarrier() {
+  __asm__ __volatile__ ("mf" : : : "memory");
+}
+inline void WriteMemoryBarrier() {
+  __asm__ __volatile__ ("mf" : : : "memory");
+}
+#define LEVELDB_HAVE_MEMORY_BARRIER
+
+// ALPHA
+#elif defined(ARCH_CPU_ALPHA_FAMILY)
+
+inline void ReadMemoryBarrier() {
+  __asm__ __volatile__("mb" : : : "memory");
+}
+inline void WriteMemoryBarrier() {
+  __asm__ __volatile__("wmb" : : : "memory");
+}
+#define LEVELDB_HAVE_MEMORY_BARRIER
+
+// S390
+#elif defined(ARCH_CPU_S390_FAMILY)
+
+inline void ReadMemoryBarrier() {
+  asm volatile("bcr 15,0" : : : "memory");
+}
+inline void WriteMemoryBarrier() {
+  asm volatile("bcr 15,0" : : : "memory");
+}
+#define LEVELDB_HAVE_MEMORY_BARRIER
+
+// SPARC
+#elif defined(ARCH_CPU_SPARC_FAMILY)
+
+inline void ReadMemoryBarrier() {
+  __asm__ __volatile__("" : : : "memory");
+}
+inline void WriteMemoryBarrier() {
+  __asm__ __volatile__("" : : : "memory");
+}
+#define LEVELDB_HAVE_MEMORY_BARRIER
+
+// SH
+#elif defined(ARCH_CPU_SH_FAMILY)
+#if defined(__SH4A__) || defined(__SH5__)
+inline void ReadMemoryBarrier() {
+  __asm__ __volatile__ ("synco": : :"memory");
+}
+inline void WriteMemoryBarrier() {
+  __asm__ __volatile__ ("synco": : :"memory");
+}
+#else
+inline void ReadMemoryBarrier() {
+  __asm__ __volatile__ ("": : :"memory");
+}
+inline void WriteMemoryBarrier() {
+  __asm__ __volatile__ ("": : :"memory");
+}
+#endif
+#define LEVELDB_HAVE_MEMORY_BARRIER
+
+// PARISC
+#elif defined(ARCH_CPU_PARISC_FAMILY)
+
+inline void ReadMemoryBarrier() {
+  __asm__ __volatile__("" : : : "memory");
+}
+inline void WriteMemoryBarrier() {
+  __asm__ __volatile__("" : : : "memory");
+ }
+ #define LEVELDB_HAVE_MEMORY_BARRIER
+ 
+@@ -133,11 +246,11 @@ class AtomicPointer {
+   inline void NoBarrier_Store(void* v) { rep_ = v; }
+   inline void* Acquire_Load() const {
+     void* result = rep_;
+-    MemoryBarrier();
+    ReadMemoryBarrier();
+     return result;
+   }
+   inline void Release_Store(void* v) {
+-    MemoryBarrier();
+    WriteMemoryBarrier();
+     rep_ = v;
+   }
+ };
+@@ -235,6 +348,12 @@ class AtomicPointer {
+ #undef ARCH_CPU_ARM_FAMILY
+ #undef ARCH_CPU_ARM64_FAMILY
+ #undef ARCH_CPU_PPC_FAMILY
+#undef ARCH_CPU_IA64_FAMILY
+#undef ARCH_CPU_ALPHA_FAMILY
+#undef ARCH_CPU_S390_FAMILY
+#undef ARCH_CPU_SPARC_FAMILY
+#undef ARCH_CPU_SH_FAMILY
+#undef ARCH_CPU_PARISC_FAMILY
+ 
+ }  // namespace port
+ }  // namespace leveldb
--- a/leveldb.changes
+++ b/leveldb.changes
@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Aug 11 10:44:05 UTC 2017 - ncutler@suse.com
+
+- added 0001-debian-ports.patch
+  * obtained by rebasing https://github.com/google/leveldb/pull/291
+    on top of 1.20 (one non-trivial conflict involving aarch64,
+    consulted with ARM experts - NOTE: this patch has not been
+    accepted upstream, but it's needed to support s390x)
+
 -------------------------------------------------------------------
 Thu Aug 10 11:52:35 UTC 2017 - ncutler@suse.com

--- a/leveldb.spec
+++ b/leveldb.spec
@ -24,6 +24,7 @@ License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Url:            https://github.com/google/leveldb
 Source0:        https://github.com/google/leveldb/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         0001-debian-ports.patch
 BuildRequires:  gcc-c++
 BuildRequires:  snappy-devel

@ -65,6 +66,7 @@ This package holds the development files for statically linking leveldb.

 %prep
 %setup -q
+%patch0 -p1

 %build
 make %{?_smp_mflags} OPT="%{optflags}"