Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package opae for openSUSE:Factory checked in
at 2022-06-24 08:45:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/opae (Old)
and /work/SRC/openSUSE:Factory/.opae.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opae"
Fri Jun 24 08:45:21 2022 rev:12 rq:984706 version:2.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/opae/opae.changes 2021-09-10
23:41:47.814590389 +0200
+++ /work/SRC/openSUSE:Factory/.opae.new.1548/opae.changes 2022-06-24
08:45:36.319158988 +0200
@@ -1,0 +2,6 @@
+Thu Jun 23 10:43:36 UTC 2022 - Nicolas Morey-Chaisemartin
<nmoreychaisemar...@suse.com>
+
+- Add opae-disable-FORTIFY_SOURCE.patch to only use the FORTIFY_SOURCE from
the RPM flags
+ and avoid any conflicts. Fixes a build issue with Tumbleweed.
+
+-------------------------------------------------------------------
New:
----
opae-disable-FORTIFY_SOURCE.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opae.spec ++++++
--- /var/tmp/diff_new_pack.YFpPBq/_old 2022-06-24 08:45:37.127159893 +0200
+++ /var/tmp/diff_new_pack.YFpPBq/_new 2022-06-24 08:45:37.131159898 +0200
@@ -1,7 +1,7 @@
#
# spec file for package opae
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -42,6 +42,7 @@
Patch3: opae-libs-fix-macro-indentation.patch
Patch4: opae-libs-xfpga-fix-strnlen-argument.patch
Patch5: opae-fix-support-with-newer-spdlog.patch
+Patch6: opae-disable-FORTIFY_SOURCE.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: boost-devel
BuildRequires: cli11-devel
@@ -151,6 +152,7 @@
%patch3
%patch4
%patch5
+%patch6
%build
export RPM_OPT_FLAGS
++++++ opae-disable-FORTIFY_SOURCE.patch ++++++
commit 217b7a78ac8ec4c4c1b05df549b7c1c8bb6e9bbd
Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
Date: Thu Jun 23 12:42:06 2022 +0200
opae: disable FORTIFY_SOURCE
This is already set by the RPM flags and causes build to fail:
[ 11s] <command-line>: error: "_FORTIFY_SOURCE" redefined [-Werror]
[ 11s] <command-line>: note: this is the location of the previous
definition
[ 11s] cc1plus: all warnings being treated as errors
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com>
diff --git opae-libs/cmake/modules/OPAECompiler.cmake
opae-libs/cmake/modules/OPAECompiler.cmake
index 224f3026de9a..2e928bee82f5 100644
--- opae-libs/cmake/modules/OPAECompiler.cmake
+++ opae-libs/cmake/modules/OPAECompiler.cmake
@@ -99,7 +99,7 @@ set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -Wall -Wextra -Werror
-pthread")
if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL
"RelWithDebInfo")
# C options
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wformat -Wformat-security")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -D_FORTIFY_SOURCE=2")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
if(GCC_VERSION VERSION_GREATER 4.9 OR GCC_VERSION VERSION_EQUAL 4.9)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -z noexecstack -z relro -z now")
@@ -109,7 +109,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE
STREQUAL "RelWithDebI
# C++ options
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -D_FORTIFY_SOURCE=2")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
if(GCC_VERSION VERSION_GREATER 4.9 OR GCC_VERSION VERSION_EQUAL 4.9)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z noexecstack -z relro -z
now")
