Hello community, here is the log from the commit of package mozc for openSUSE:Factory checked in at 2015-08-19 09:29:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mozc (Old) and /work/SRC/openSUSE:Factory/.mozc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mozc" Changes: -------- --- /work/SRC/openSUSE:Factory/mozc/mozc.changes 2015-08-14 14:47:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mozc.new/mozc.changes 2015-08-19 09:29:43.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Aug 17 12:51:02 UTC 2015 - [email protected] + +- Enable PowerPC builds. + * Add generic atomics on Power (protobuf-generic-atomic.patch , + protobuf-atomic.patch) + * Workaround llvm bug https://llvm.org/bugs/show_bug.cgi?id=22248 + (mozc-stack-protector.patch) + +------------------------------------------------------------------- New: ---- mozc-stack-protector.patch protobuf-atomic.patch protobuf-generic-atomic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozc.spec ++++++ --- /var/tmp/diff_new_pack.AbNbJm/_old 2015-08-19 09:29:45.000000000 +0200 +++ /var/tmp/diff_new_pack.AbNbJm/_new 2015-08-19 09:29:45.000000000 +0200 @@ -71,6 +71,13 @@ # PATCH-FIX-UPSTREAM [email protected] Patch2: mozc-ninja-verbose-build.patch +# PATCH-FIX-OPENSUSE [email protected] +Patch3: mozc-stack-protector.patch + +# PATCH-FIX-UPSTREAM - https://groups.google.com/forum/#!topic/protobuf/ZXxXR3uPAM4 +Patch4: protobuf-generic-atomic.patch +Patch5: protobuf-atomic.patch + BuildRequires: llvm-clang BuildRequires: ninja >= 1.4 BuildRequires: pkgconfig @@ -83,7 +90,7 @@ # Exclude PowerPC arches because no support in # third_party/protobuf/src/google/protobuf/stubs/ atomicops -ExcludeArch: ppc ppc64 ppc64le +#ExcludeArch: ppc ppc64 ppc64le %description Mozc is a Japanese Input Method Editor (IME) designed for @@ -152,6 +159,9 @@ %patch1 -p0 %patch2 -p1 +%ifarch ppc ppc64 ppc64le +%patch3 -p1 +%endif cp %{SOURCE1} . @@ -161,6 +171,10 @@ tar xvf %{SOURCE3} # japanese_usage_dictionary tar xvf %{SOURCE5} +cd protobuf +%patch4 -p1 +%patch5 -p1 +cd .. popd # fix installation path @@ -180,6 +194,9 @@ # -Wall from RPM_OPT_FLAGS overrides -Wno-* options from gyp. # gyp inserts -Wall to the head of release_extra_flags. flags=${RPM_OPT_FLAGS/-Wall/} +%ifarch ppc ppc64 ppc64le +flags=${flags/-fstack-protector/} +%endif export GYP_DEFINES='ibus_mozc_path=%{ibus_mozc_path} ibus_mozc_icon_path=%{ibus_mozc_icon_path} use_libprotobuf=0 document_dir=%{document_dir} zinnia_model_file=%{zinnia_model_path} release_extra_cflags="'$flags'"' ++++++ mozc-stack-protector.patch ++++++ Index: mozc-2.16.2037.102/gyp/common.gypi =================================================================== --- mozc-2.16.2037.102.orig/gyp/common.gypi +++ mozc-2.16.2037.102/gyp/common.gypi @@ -89,7 +89,6 @@ 'linux_cflags': [ '<@(gcc_cflags)', '-fno-omit-frame-pointer', - '-fstack-protector', '--param=ssp-buffer-size=4', ], # nacl_cflags will be used for NaCl. ++++++ protobuf-atomic.patch ++++++ >From 17037a67bae85385a6f98273a824fb9350f8ccaa Mon Sep 17 00:00:00 2001 From: sangameshs <[email protected]> Date: Thu, 10 Jul 2014 08:09:22 -0500 Subject: [PATCH] File atomicops_internals_generic_gcc.h --- .../stubs/atomicops_internals_generic_gcc.h | 139 +++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 src/google/protobuf/stubs/atomicops_internals_generic_gcc.h diff --git a/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h new file mode 100644 index 0000000..3fc2a9b --- /dev/null +++ b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h @@ -0,0 +1,139 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2013 Red Hat Inc. All rights reserved. +// http://code.google.com/p/protobuf/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Red Hat Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +// This file is an internal atomic implementation, use atomicops.h instead. + +#ifndef GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_GCC_H_ +#define GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_GCC_H_ + +namespace google { +namespace protobuf { +namespace internal { + +inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, + Atomic32 old_value, + Atomic32 new_value) { + __atomic_compare_exchange_n(ptr, &old_value, new_value, true, + __ATOMIC_RELAXED, __ATOMIC_RELAXED); + return old_value; +} + +inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, + Atomic32 new_value) { + return __atomic_exchange_n(ptr, new_value, __ATOMIC_RELAXED); +} + +inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, + Atomic32 increment) { + return __atomic_add_fetch(ptr, increment, __ATOMIC_RELAXED); +} + +inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, + Atomic32 increment) { + return __atomic_add_fetch(ptr, increment, __ATOMIC_SEQ_CST); +} + +inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, + Atomic32 old_value, + Atomic32 new_value) { + __atomic_compare_exchange(ptr, &old_value, &new_value, true, + __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE); + return old_value; +} + +inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, + Atomic32 old_value, + Atomic32 new_value) { + __atomic_compare_exchange_n(ptr, &old_value, new_value, true, + __ATOMIC_RELEASE, __ATOMIC_ACQUIRE); + return old_value; +} + +inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { + __atomic_store_n(ptr, value, __ATOMIC_RELAXED); +} + +inline void MemoryBarrier() { + __sync_synchronize(); +} + +inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { + __atomic_store_n(ptr, value, __ATOMIC_ACQUIRE); +} + +inline void Release_Store(volatile Atomic32* ptr, Atomic32 value) { + __atomic_store_n(ptr, value, __ATOMIC_RELEASE); +} + +inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { + return __atomic_load_n(ptr, __ATOMIC_RELAXED); +} + +inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { + return __atomic_load_n(ptr, __ATOMIC_ACQUIRE); +} + +inline Atomic32 Release_Load(volatile const Atomic32* ptr) { + return __atomic_load_n(ptr, __ATOMIC_RELEASE); +} + +#ifdef __LP64__ + +inline void Release_Store(volatile Atomic64* ptr, Atomic64 value) { + __atomic_store_n(ptr, value, __ATOMIC_RELEASE); +} + +inline Atomic64 Acquire_Load(volatile const Atomic64* ptr) { + return __atomic_load_n(ptr, __ATOMIC_ACQUIRE); +} + +inline Atomic64 Acquire_CompareAndSwap(volatile Atomic64* ptr, + Atomic64 old_value, + Atomic64 new_value) { + __atomic_compare_exchange_n(ptr, &old_value, new_value, true, + __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE); + return old_value; +} + +inline Atomic64 NoBarrier_CompareAndSwap(volatile Atomic64* ptr, + Atomic64 old_value, + Atomic64 new_value) { + __atomic_compare_exchange_n(ptr, &old_value, new_value, true, + __ATOMIC_RELAXED, __ATOMIC_RELAXED); + return old_value; +} + +#endif // defined(__LP64__) + +} // namespace internal +} // namespace protobuf +} // namespace google + +#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_GCC_H_ ++++++ protobuf-generic-atomic.patch ++++++ >From 81b3b6fca4b5f6826a87397acf9bb3e8ca452e18 Mon Sep 17 00:00:00 2001 From: sangameshs <[email protected]> Date: Thu, 10 Jul 2014 07:35:45 -0500 Subject: [PATCH] Add-generic-GCC-support-for-atomic-operations Original patches from http://ppc.koji.fedoraproject.org/kojifiles/packages/protobuf/2.5.0/7.fc21/src/protobuf-2.5.0-7.fc21.src.rpm --- README.txt | 19 +++++++++++++++++++ src/Makefile.am | 1 + src/Makefile.in | 2 ++ src/google/protobuf/stubs/atomicops.h | 2 +- src/google/protobuf/stubs/platform_macros.h | 14 +++++++++++++- 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/README.txt b/README.txt index 17551a5..53f2296 100644 --- a/README.txt +++ b/README.txt @@ -2,6 +2,25 @@ Protocol Buffers - Google's data interchange format Copyright 2008 Google Inc. http://code.google.com/apis/protocolbuffers/ +Compiling in PLinux RHEL6 or RHEL7 +================================== +For compiling protobuf on PLinux(big-endian) RHEL6 or 7 we need to use gcc >= +4.7. + +We can get the gcc >= 4.7 from Advanced toolchain. +ftp://ftp.unicamp.br/pub/linuxpatch/toolchain/at/redhat +And we need below two rpms + +advance-toolchain-at7.0-devel-7.0-4.ppc64 +advance-toolchain-at7.0-runtime-7.0-4.ppc64 + +After installing the rpms set the envirnoment variables as + +export CXX=/opt/at7.0/bin/powerpc64-linux-c++ +export CC=/opt/at7.0/bin/powerpc64-linux-gcc + +and then compile it using the instructions given below. + C++ Installation - Unix ======================= diff --git a/src/Makefile.am b/src/Makefile.am index df733d9..6f5c21d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,6 +42,7 @@ nobase_include_HEADERS = \ google/protobuf/stubs/atomicops_internals_arm_gcc.h \ google/protobuf/stubs/atomicops_internals_arm_qnx.h \ google/protobuf/stubs/atomicops_internals_atomicword_compat.h \ + google/protobuf/stubs/atomicops_internals_generic_gcc.h \ google/protobuf/stubs/atomicops_internals_macosx.h \ google/protobuf/stubs/atomicops_internals_mips_gcc.h \ google/protobuf/stubs/atomicops_internals_pnacl.h \ diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h index b8581fa..883b125 100644 --- a/src/google/protobuf/stubs/atomicops.h +++ b/src/google/protobuf/stubs/atomicops.h @@ -185,7 +185,7 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #elif defined(__pnacl__) #include <google/protobuf/stubs/atomicops_internals_pnacl.h> #else -GOOGLE_PROTOBUF_ATOMICOPS_ERROR +#include <google/protobuf/stubs/atomicops_internals_generic_gcc.h> #endif // Unknown. diff --git a/src/google/protobuf/stubs/platform_macros.h b/src/google/protobuf/stubs/platform_macros.h index b1df60e..db691d8 100644 --- a/src/google/protobuf/stubs/platform_macros.h +++ b/src/google/protobuf/stubs/platform_macros.h @@ -43,6 +43,9 @@ #elif defined(_M_IX86) || defined(__i386__) #define GOOGLE_PROTOBUF_ARCH_IA32 1 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 +#elif defined(__aarch64__) +#define GOOGLE_PROTOBUF_ARCH_AARCH64 1 +#define GOOGLE_PROTOBUF_ARCH_64_BIT 1 #elif defined(__QNX__) #define GOOGLE_PROTOBUF_ARCH_ARM_QNX 1 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 @@ -54,9 +57,18 @@ #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 #elif defined(__pnacl__) #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 -#elif defined(__ppc__) +#elif defined(__ppc64__) || defined(__PPC64__) +#define GOOGLE_PROTOBUF_ARCH_PPC64 1 +#define GOOGLE_PROTOBUF_ARCH_64_BIT 1 +#elif defined(__ppc__) || defined(__PPC__) #define GOOGLE_PROTOBUF_ARCH_PPC 1 #define GOOGLE_PROTOBUF_ARCH_32_BIT 1 +#elif defined(__s390x__) +#define GOOGLE_PROTOBUF_ARCH_64_BIT 1 +#define GOOGLE_PROTOBUF_ARCH_S390X 1 +#elif defined(__s390__) +#define GOOGLE_PROTOBUF_ARCH_32_BIT 1 +#define GOOGLE_PROTOBUF_ARCH_S390 1 #else #error Host architecture was not detected as supported by protobuf #endif
