Hello community, here is the log from the commit of package libdb-4_8 for openSUSE:Factory checked in at 2018-03-24 16:04:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdb-4_8 (Old) and /work/SRC/openSUSE:Factory/.libdb-4_8.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdb-4_8" Sat Mar 24 16:04:14 2018 rev:28 rq:586302 version:4.8.30 Changes: -------- --- /work/SRC/openSUSE:Factory/libdb-4_8/libdb-4_8.changes 2016-04-14 12:59:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libdb-4_8.new/libdb-4_8.changes 2018-03-24 16:04:17.631476165 +0100 @@ -1,0 +2,6 @@ +Tue Mar 13 08:59:56 UTC 2018 - [email protected] + +- Add libdb-fix-atomic.patch to fix __atomic_compare_exchange clash + with GCCs builtin. Fixes build with GCC8 which now rejects this. + +------------------------------------------------------------------- libdb_java-4_8.changes: same change New: ---- libdb-fix-atomic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdb-4_8.spec ++++++ --- /var/tmp/diff_new_pack.38B6p5/_old 2018-03-24 16:04:19.655403204 +0100 +++ /var/tmp/diff_new_pack.38B6p5/_new 2018-03-24 16:04:19.655403204 +0100 @@ -32,6 +32,8 @@ 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 @@ %prep %setup -q -n %{generic_name}-%{version} %patch0 +%patch1 %build cd dist ++++++ libdb_java-4_8.spec ++++++ --- /var/tmp/diff_new_pack.38B6p5/_old 2018-03-24 16:04:19.695401762 +0100 +++ /var/tmp/diff_new_pack.38B6p5/_new 2018-03-24 16:04:19.695401762 +0100 @@ -32,6 +32,8 @@ 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 @@ %setup -q -n %{generic_name}-%{version} %patch0 %patch1 -p1 +%patch2 %build cd dist ++++++ libdb-fix-atomic.patch ++++++ 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;
