Accepting request 586282 from home:rguenther:branches:devel:libraries:c_c++

- Add libdb-fix-atomic.patch to fix __atomic_compare_exchange clash
  with GCCs builtin.  Fixes build with GCC8 which now rejects this.

OBS-URL: https://build.opensuse.org/request/show/586282
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libdb-4_8?expand=0&rev=50

libdb-4_8.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 13 08:59:56 UTC 2018 - rguenther@suse.com
+
+- Add libdb-fix-atomic.patch to fix __atomic_compare_exchange clash
+  with GCCs builtin.  Fixes build with GCC8 which now rejects this.
+
 -------------------------------------------------------------------
 Thu Mar 31 09:50:39 UTC 2016 - tchvatal@suse.com
 

libdb-4_8.spec

@@ -32,6 +32,8 @@ Source1:        %{name}.changes
 Source2:        baselibs.conf
 Source9:        getpatches
 Patch0:         db-%{version}.patch
+# PATCH-FIX-OPENSUSE Fix build with GCC8, conflict with reserved builtin name
+Patch1:         libdb-fix-atomic.patch
 BuildRequires:  autoconf
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -91,6 +93,7 @@ This package contains the header files and libraries.
 %prep
 %setup -q -n %{generic_name}-%{version}
 %patch0
+%patch1
 
 %build
 cd dist

libdb-fix-atomic.patch

@@ -0,0 +1,22 @@
+Fix use of reserved identifier __atomic_compare_exchange by renaming
+
+--- dbinc/atomic.h.orig	2018-03-13 09:44:13.197929296 +0100
++++ dbinc/atomic.h	2018-03-13 09:45:09.582831244 +0100
+@@ -144,7 +144,7 @@
+ #define	atomic_inc(env, p)	__atomic_inc(p)
+ #define	atomic_dec(env, p)	__atomic_dec(p)
+ #define	atomic_compare_exchange(env, p, o, n)	\
+-	__atomic_compare_exchange((p), (o), (n))
++	__db_atomic_compare_exchange((p), (o), (n))
+ static inline int __atomic_inc(db_atomic_t *p)
+ {
+ 	int	temp;
+@@ -176,7 +176,7 @@
+  * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html
+  * which configure could be changed to use.
+  */
+-static inline int __atomic_compare_exchange(
++static inline int __db_atomic_compare_exchange(
+ 	db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval)
+ {
+ 	atomic_value_t was;

libdb_java-4_8.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 13 08:59:56 UTC 2018 - rguenther@suse.com
+
+- Add libdb-fix-atomic.patch to fix __atomic_compare_exchange clash
+  with GCCs builtin.  Fixes build with GCC8 which now rejects this.
+
 -------------------------------------------------------------------
 Tue Jan  9 13:26:27 UTC 2018 - pmonrealgonzalez@suse.com
 

libdb_java-4_8.spec

@@ -32,6 +32,8 @@ Source9:        getpatches
 Patch0:         db-%{version}.patch
 # PATCH-FIX-OPENSUSE Fix compilation with Java 10 (10-internal)
 Patch1:         libdb_java-4_8-fix-java10-comp.patch
+# PATCH-FIX-OPENSUSE Fix build with GCC8, conflict with reserved builtin name
+Patch2:         libdb-fix-atomic.patch
 BuildRequires:  autoconf
 BuildRequires:  gcc-c++
 BuildRequires:  java-sdk >= 1.5
@@ -63,6 +65,7 @@ These are the development files.
 %setup -q -n %{generic_name}-%{version}
 %patch0
 %patch1 -p1
+%patch2
 
 %build
 cd dist