[rpms/soci] update-to-4.1.4: Disabled Werror flag

[rpms/soci] update-to-4.1.4: Disabled Werror flag

[Denis Arnaud]

A new commit has been pushed.

Repo   : rpms/soci
Branch : update-to-4.1.4
Commit : 73658b104d1db3e8c07ab295a6a809cfa00dd54a
Author : Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date   : 2020-06-04T23:13:33+02:00
Stats  : +26/-2 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/soci/c/73658b104d1db3e8c07ab295a6a809cfa00dd54a?branch=update-to-4.1.4

Log:
Disabled Werror flag

---
diff --git a/soci-werror.patch b/soci-werror.patch
new file mode 100644
index 0000000..696efb6
--- /dev/null
+++ b/soci-werror.patch
@@ -0,0 +1,22 @@
+diff --git a/cmake/SociConfig.cmake b/cmake/SociConfig.cmake
+index 8a74330d..2bce264d 100644
+--- a/cmake/SociConfig.cmake
++++ b/cmake/SociConfig.cmake
+@@ -63,8 +63,15 @@ if (MSVC)
+ 
+ else()
+ 
++  # Set the -Werror compilation flag (where all the compilation warnings are
++  # considered as errors) only when building in Debug mode
++  set(SOCI_WERROR_OPTION "")
++  if (CMAKE_BUILD_TYPE STREQUAL "Debug")
++     set(SOCI_WERROR_OPTION "-Werror")
++  endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
++
+   set(SOCI_GCC_CLANG_COMMON_FLAGS
+-    "-pedantic -Werror -Wno-error=parentheses -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Woverloaded-virtual -Wredundant-decls -Wno-long-long")
++    "-pedantic ${SOCI_WERROR_OPTION} -Wno-error=parentheses -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Woverloaded-virtual -Wredundant-decls -Wno-long-long")
+ 
+ 
+   if (SOCI_CXX11)
+

diff --git a/soci.spec b/soci.spec
index 8a5ee4a..d2fbbfe 100644
--- a/soci.spec
+++ b/soci.spec
@@ -31,8 +31,9 @@ Source0:        %{url}/archive/%{ups_version}.tar.gz#/%{name}-%{version}.tar.gz
 
 # For some reason, as of November 2019, it does not compile on ARMv7hl
 # See https://koji.fedoraproject.org/koji/taskinfo?taskID=38562666
-# Upstream issue: https://github.com/SOCI/soci/pull/813#event-3406547053
-ExcludeArch:    armv7hl
+# Upstream issue: https://github.com/SOCI/soci/pull/815
+#ExcludeArch:    armv7hl
+Patch0:         soci-werror.patch
 
 BuildRequires:  dos2unix
 BuildRequires:  gcc gcc-c++
@@ -183,6 +184,7 @@ library. The documentation is the same as at the %{name} web page.
 
 %prep
 %setup -q -n %{name}-%{ups_ver}
+%patch -p1
 
 # Rename change-log and license file, so that they comply with
 # packaging standard