From ae492bb4102b36d44e3d3fbcb6c711ed78858b07cc8b97c32e3fd49b8732621e Mon Sep 17 00:00:00 2001 From: "Michal Hrusecky (old before rename to _miska_)" Date: Mon, 10 Jun 2013 10:39:26 +0000 Subject: [PATCH] Accepting request 178026 from home:k0da:ppc - package google/protobuf/stubs/atomicops_internals_generic_gcc.h mosh reqires it OBS-URL: https://build.opensuse.org/request/show/178026 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=28 --- ...ic-GCC-support-for-atomic-operations.patch | 57 ++++++++++++++----- protobuf.changes | 6 ++ 2 files changed, 49 insertions(+), 14 deletions(-) diff --git a/0001-Add-generic-GCC-support-for-atomic-operations.patch b/0001-Add-generic-GCC-support-for-atomic-operations.patch index 8fd5742..d5956a0 100644 --- a/0001-Add-generic-GCC-support-for-atomic-operations.patch +++ b/0001-Add-generic-GCC-support-for-atomic-operations.patch @@ -12,10 +12,10 @@ written. 3 files changed, 153 insertions(+), 2 deletions(-) create mode 100644 src/google/protobuf/stubs/atomicops_internals_generic_gcc.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 +Index: protobuf-2.5.0/src/google/protobuf/stubs/atomicops.h +=================================================================== +--- protobuf-2.5.0.orig/src/google/protobuf/stubs/atomicops.h ++++ protobuf-2.5.0/src/google/protobuf/stubs/atomicops.h @@ -185,7 +185,7 @@ GOOGLE_PROTOBUF_ATOMICOPS_ERROR #elif defined(__pnacl__) #include @@ -25,11 +25,10 @@ index b8581fa..883b125 100644 #endif // Unknown. -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 +Index: protobuf-2.5.0/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h +=================================================================== --- /dev/null -+++ b/src/google/protobuf/stubs/atomicops_internals_generic_gcc.h ++++ protobuf-2.5.0/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. @@ -170,10 +169,10 @@ index 0000000..3fc2a9b +} // namespace google + +#endif // GOOGLE_PROTOBUF_ATOMICOPS_INTERNALS_GENERIC_GCC_H_ -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 +Index: protobuf-2.5.0/src/google/protobuf/stubs/platform_macros.h +=================================================================== +--- protobuf-2.5.0.orig/src/google/protobuf/stubs/platform_macros.h ++++ protobuf-2.5.0/src/google/protobuf/stubs/platform_macros.h @@ -43,6 +43,9 @@ #elif defined(_M_IX86) || defined(__i386__) #define GOOGLE_PROTOBUF_ARCH_IA32 1 @@ -204,5 +203,35 @@ index b1df60e..db691d8 100644 #else #error Host architecture was not detected as supported by protobuf #endif --- -1.8.1.4 +Index: protobuf-2.5.0/src/Makefile.am +=================================================================== +--- protobuf-2.5.0.orig/src/Makefile.am ++++ protobuf-2.5.0/src/Makefile.am +@@ -47,6 +47,7 @@ nobase_include_HEADERS = + google/protobuf/stubs/atomicops_internals_pnacl.h \ + google/protobuf/stubs/atomicops_internals_x86_gcc.h \ + google/protobuf/stubs/atomicops_internals_x86_msvc.h \ ++ google/protobuf/stubs/atomicops_internals_generic_gcc.h \ + google/protobuf/stubs/common.h \ + google/protobuf/stubs/platform_macros.h \ + google/protobuf/stubs/once.h \ +Index: protobuf-2.5.0/src/Makefile.in +=================================================================== +--- protobuf-2.5.0.orig/src/Makefile.in ++++ protobuf-2.5.0/src/Makefile.in +@@ -314,6 +314,7 @@ am__nobase_include_HEADERS_DIST = google + google/protobuf/stubs/atomicops_internals_pnacl.h \ + google/protobuf/stubs/atomicops_internals_x86_gcc.h \ + google/protobuf/stubs/atomicops_internals_x86_msvc.h \ ++ google/protobuf/stubs/atomicops_internals_generic_gcc.h \ + google/protobuf/stubs/common.h \ + google/protobuf/stubs/platform_macros.h \ + google/protobuf/stubs/once.h \ +@@ -523,6 +524,7 @@ nobase_include_HEADERS = \ + google/protobuf/stubs/atomicops_internals_pnacl.h \ + google/protobuf/stubs/atomicops_internals_x86_gcc.h \ + google/protobuf/stubs/atomicops_internals_x86_msvc.h \ ++ google/protobuf/stubs/atomicops_internals_generic_gcc.h \ + google/protobuf/stubs/common.h \ + google/protobuf/stubs/platform_macros.h \ + google/protobuf/stubs/once.h \ diff --git a/protobuf.changes b/protobuf.changes index e8e59d7..90de9b0 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 7 15:32:55 UTC 2013 - dvaleev@suse.com + +- package google/protobuf/stubs/atomicops_internals_generic_gcc.h + mosh reqires it + ------------------------------------------------------------------- Mon May 27 10:44:05 UTC 2013 - dvaleev@suse.com