Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2018-02-25 11:32:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Sun Feb 25 11:32:58 2018 rev:31 rq:579472 version:3.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2018-01-26 13:34:44.686619329 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf.new/protobuf.changes 2018-02-25 11:32:59.711025216 +0100 @@ -1,0 +2,8 @@ +Fri Feb 23 10:12:07 UTC 2018 - m...@suse.com + +- Add adding-Release_CompareAndSwap-64-bit-variant.patch + * Fix compile error undefined reference to + `google::protobuf::internal::Release_CompareAndSwap(long volatile*, long, long)' + on s390x https://github.com/google/protobuf/issues/3937 + +------------------------------------------------------------------- New: ---- adding-Release_CompareAndSwap-64-bit-variant.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.YBHZ7D/_old 2018-02-25 11:33:00.574993842 +0100 +++ /var/tmp/diff_new_pack.YBHZ7D/_new 2018-02-25 11:33:00.574993842 +0100 @@ -34,6 +34,8 @@ Source0: https://github.com/google/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz Source1: manifest.txt.in Source2: baselibs.conf +# PATCH-FIX-UPSTREAM Adding Release_CompareAndSwap 64-bit variant to fix compile error - m...@suse.com +Patch0: adding-Release_CompareAndSwap-64-bit-variant.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module python-dateutil} BuildRequires: %{python_module python-gflags} @@ -128,6 +130,7 @@ %prep %setup -q -n %{tarname}-%{version} +%patch0 -p1 mkdir gmock %if %{with python2} || %{with python3} ++++++ adding-Release_CompareAndSwap-64-bit-variant.patch ++++++ >From 642e1ac635f2563b4a14c255374f02645ae85dac Mon Sep 17 00:00:00 2001 From: Nayana-ibm <nayana.tho...@gmail.com> Date: Mon, 27 Nov 2017 05:43:30 -0500 Subject: [PATCH] Adding Release_CompareAndSwap 64-bit variant --- src/google/protobuf/stubs/atomicops_internals_generic_gcc.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h index 0b0b06ce..075c406a 100644 --- a/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h +++ b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h @@ -146,6 +146,14 @@ inline Atomic64 NoBarrier_Load(volatile const Atomic64* ptr) { return __atomic_load_n(ptr, __ATOMIC_RELAXED); } +inline Atomic64 Release_CompareAndSwap(volatile Atomic64* ptr, + Atomic64 old_value, + Atomic64 new_value) { + __atomic_compare_exchange_n(ptr, &old_value, new_value, false, + __ATOMIC_RELEASE, __ATOMIC_ACQUIRE); + return old_value; +} + #endif // defined(__LP64__) } // namespace internal -- 2.16.1
