commit qpid-cpp for openSUSE:Factory

29 Jun 2017

Hello community,

here is the log from the commit of package qpid-cpp for openSUSE:Factory checked in at 2017-06-29 15:20:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qpid-cpp (Old)
 and      /work/SRC/openSUSE:Factory/.qpid-cpp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "qpid-cpp"

Thu Jun 29 15:20:15 2017 rev:7 rq:506946 version:1.36.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/qpid-cpp/qpid-cpp.changes	2017-03-12 20:02:58.186503674 +0100
+++ /work/SRC/openSUSE:Factory/.qpid-cpp.new/qpid-cpp.changes	2017-06-29 15:20:55.431788385 +0200
@@ -1,0 +2,13 @@
+Wed Jun 28 11:10:28 UTC 2017 - mlin@suse.com
+
+- Add patches to fix build failure
+  * 0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch
+    - Fix build problem in broker.
+  * 0001-QPID-7714-Suppress-very-verbose-warnings.patch
+    - Suppress warnings per gcc7.
+  * 0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch
+    - Fix compile with newer nss and sasl.
+  * Suppress-maybe-uninitialized-warning.diff
+    - Suppress -Werror=maybe-uninitialized if gcc version great than 7.
+
+-------------------------------------------------------------------

New:
----
  0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch
  0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch
  0001-QPID-7714-Suppress-very-verbose-warnings.patch
  Suppress-maybe-uninitialized-warning.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qpid-cpp.spec ++++++
--- /var/tmp/diff_new_pack.aSpf9y/_old	2017-06-29 15:20:56.895581471 +0200
+++ /var/tmp/diff_new_pack.aSpf9y/_new	2017-06-29 15:20:56.899580906 +0200
@@ -31,6 +31,14 @@
 Patch3:         qpid-cpp-initdir.patch
 Patch4:         %{name}-0.30-cmake.patch
 Patch5:         %{name}-aarch64.patch
+# PATCH-FIX-UPSTREAM 0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch
+Patch6:         0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch
+# PATCH-FIX-UPSTREAM 0001-QPID-7714-Suppress-very-verbose-warnings.patch
+Patch7:         0001-QPID-7714-Suppress-very-verbose-warnings.patch
+# PATCH-FIX-UPSTREAM 0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch
+Patch8:         0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch
+# PATCH-FIX-OPENSUSE Suppress-maybe-uninitialized-warning.diff
+Patch9:         Suppress-maybe-uninitialized-warning.diff
 %if 0%{?suse_version} > 1325
 BuildRequires:  libboost_program_options-devel
 BuildRequires:  libboost_system-devel
@@ -374,6 +382,10 @@
 %patch3 -p1 -b .initdir
 %patch4 -p1
 %patch5 -p2
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest"
 

++++++ 0001-QPID-7629-Use-the-CMake-SYSTEM-keyword-when-includin.patch ++++++
...
From f04bc169f11c99be50399341905186b3405a3130 Mon Sep 17 00:00:00 2001
From: Justin Ross <jross@apache.org>
Date: Thu, 23 Mar 2017 05:53:51 -0700
Subject: [PATCH] QPID-7629: Use the CMake SYSTEM keyword when including
 headers for nss and sasl
---
 src/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7bc6f2c22..6ee474f29 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -371,7 +371,7 @@ if (BUILD_SASL)
       qpid/sys/cyrus/CyrusSecurityLayer.h
       qpid/sys/cyrus/CyrusSecurityLayer.cpp
      )
-  include_directories (${CYRUS_SASL_INCLUDE_DIR})
+  include_directories (SYSTEM ${CYRUS_SASL_INCLUDE_DIR})
   set(sasl_LIB ${CYRUS_SASL_LIBRARY})
   set(HAVE_SASL 1)
 else (BUILD_SASL)
@@ -451,7 +451,7 @@ if (BUILD_SSL)
   # Add include directories and link directories for NSS
   # unfortunately this doesn't get done automatically for
   # libraries detected by FindPkgConfig
-  include_directories(${ssl_INCLUDES})
+  include_directories(SYSTEM ${ssl_INCLUDES})
   link_directories(${ssl_LIBDIRS})
 endif (BUILD_SSL)
 
-- 
2.12.3

++++++ 0001-QPID-7674-Broker-bulid-problem-with-GCC-7.patch ++++++
...
From 25e73e5a4c33783ff3e25f24c78a3608b7c32ea6 Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway@redhat.com>
Date: Wed, 15 Feb 2017 18:29:12 -0500
Subject: [PATCH] QPID-7674: Broker bulid problem with GCC 7, add version check
Only add the -Wno-implicit-fallthrough flag for GCC >= 7.0.0
---
 CMakeLists.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Index: qpid-cpp-1.36.0/CMakeLists.txt
===================================================================
--- qpid-cpp-1.36.0.orig/CMakeLists.txt
+++ qpid-cpp-1.36.0/CMakeLists.txt
@@ -142,8 +142,12 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
    # -Wunreachable-code -Wpadded -Winline
    # -Wshadow - warns about boost headers.
    set (WARNING_FLAGS
-        "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-error=deprecated-declarations")
+       "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-error=deprecated-declarations")
 
+   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7)
+       message("FIXME FLAGGING")
+       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-implicit-fallthrough")
+   endif()
    set (CATCH_UNDEFINED "-Wl,--no-undefined")
    # gcc on SunOS uses native linker whose "-z defs" is too fussy
    if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
++++++ 0001-QPID-7714-Suppress-very-verbose-warnings.patch ++++++
...
From 874ecfaa2c168e211ee1f250d880e9d06cbad8ef Mon Sep 17 00:00:00 2001
From: Justin Ross <jross@apache.org>
Date: Wed, 22 Mar 2017 05:41:08 -0700
Subject: [PATCH] QPID-7714: Suppress very verbose warnings
---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: qpid-cpp-1.36.0/CMakeLists.txt
===================================================================
--- qpid-cpp-1.36.0.orig/CMakeLists.txt
+++ qpid-cpp-1.36.0/CMakeLists.txt
@@ -142,7 +142,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
    # -Wunreachable-code -Wpadded -Winline
    # -Wshadow - warns about boost headers.
    set (WARNING_FLAGS
-       "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-error=deprecated-declarations")
+       "-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual -Wno-deprecated-declarations")
 
    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7)
        message("FIXME FLAGGING")
@@ -154,7 +154,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
       set (CATCH_UNDEFINED "")
    endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
   set (NOSTRICT_ALIASING "-fno-strict-aliasing")
-  set (COMPILER_FLAGS "-fvisibility-inlines-hidden")
+  set (COMPILER_FLAGS "-fvisibility-inlines-hidden -std=gnu++03")
    # gcc 4.1.2 on RHEL 5 needs -Wno-attributes to avoid an error that's fixed
    # in later gcc versions.
    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion
++++++ Suppress-maybe-uninitialized-warning.diff ++++++
Index: qpid-cpp-1.36.0/CMakeLists.txt
===================================================================
--- qpid-cpp-1.36.0.orig/CMakeLists.txt
+++ qpid-cpp-1.36.0/CMakeLists.txt
@@ -146,7 +146,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
 
    if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 7)
        message("FIXME FLAGGING")
-       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-implicit-fallthrough")
+       set(WARNING_FLAGS "${WARNING_FLAGS} -Wno-implicit-fallthrough -Wno-error=maybe-uninitialized")
    endif()
    set (CATCH_UNDEFINED "-Wl,--no-undefined")
    # gcc on SunOS uses native linker whose "-z defs" is too fussy

    

root＠hilbert.suse.de

tags

participants (1)