From 3574d964cfd6e017473e001b36cc908d413477ceb0e1dad07650a2517efec8d3 Mon Sep 17 00:00:00 2001 From: John Jolly Date: Thu, 8 Jun 2017 18:27:25 +0000 Subject: [PATCH] Accepting request 501149 from home:michals fix gcc7 build OBS-URL: https://build.opensuse.org/request/show/501149 OBS-URL: https://build.opensuse.org/package/show/security/ibmswtpm2?expand=0&rev=9 --- fix_unreferenced_macro-gcc7.patch | 13 +++++++++++++ ibmswtpm2.changes | 5 +++++ ibmswtpm2.spec | 2 ++ 3 files changed, 20 insertions(+) create mode 100644 fix_unreferenced_macro-gcc7.patch diff --git a/fix_unreferenced_macro-gcc7.patch b/fix_unreferenced_macro-gcc7.patch new file mode 100644 index 0000000..f16d25a --- /dev/null +++ b/fix_unreferenced_macro-gcc7.patch @@ -0,0 +1,13 @@ +diff -ur ibmswtpm2-832.org/src/CompilerDependencies.h ibmswtpm2-832/src/CompilerDependencies.h +--- ibmswtpm2-832.org/src/CompilerDependencies.h 2016-11-16 19:31:54.000000000 +0100 ++++ ibmswtpm2-832/src/CompilerDependencies.h 2017-06-05 13:47:16.005232774 +0200 +@@ -142,7 +142,7 @@ + # define LIB_IMPORT + # define _REDUCE_WARNING_LEVEL_(n) + # define _NORMAL_WARNING_LEVEL_ +-# define NOT_REFERENCED(x) (x = x) ++# define NOT_REFERENCED(x) (void)(x) + #endif // _MSC_VER + + #ifdef TPM_POSIX +Only in ibmswtpm2-832/src: CompilerDependencies.h~ diff --git a/ibmswtpm2.changes b/ibmswtpm2.changes index bf0007c..eb09d50 100644 --- a/ibmswtpm2.changes +++ b/ibmswtpm2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jun 5 11:49:18 UTC 2017 - msuchanek@suse.com + +- fic build with gcc7: fix_unreferenced_macro-gcc7.patch + ------------------------------------------------------------------- Tue Feb 14 12:16:37 UTC 2017 - msuchanek@suse.com diff --git a/ibmswtpm2.spec b/ibmswtpm2.spec index 6d7c32c..d1d3755 100644 --- a/ibmswtpm2.spec +++ b/ibmswtpm2.spec @@ -28,6 +28,7 @@ Url: https://sourceforge.net/projects/ibmswtpm2 Source: ibmtpm%{version}.tar Patch1: makefile.patch Patch2: bits.patch +Patch3: fix_unreferenced_macro-gcc7.patch # FIXME this is broken on BE - upstream is waiting for current spec testing to finish before porting ExcludeArch: ppc ppc64 s390 s390x BuildRequires: libopenssl-devel < 1.1 @@ -49,6 +50,7 @@ implementation because of this specific interface. %setup -c -q %patch1 -p 1 %patch2 -p 1 +%patch3 -p 1 %build cd src