From 476112400aa6ea4889d08a2ffe1a95ca100d886a Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 28 Mar 2017 11:26:25 +0200 Subject: [PATCH] added workaround for gcc7 bug on ppc64le temporary --- cmocka-1.1.0-workaround-ppc64le-gcc.patch | 12 ++++++++++++ cmocka.spec | 13 ++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 cmocka-1.1.0-workaround-ppc64le-gcc.patch diff --git a/cmocka-1.1.0-workaround-ppc64le-gcc.patch b/cmocka-1.1.0-workaround-ppc64le-gcc.patch new file mode 100644 index 0000000..36327f1 --- /dev/null +++ b/cmocka-1.1.0-workaround-ppc64le-gcc.patch @@ -0,0 +1,12 @@ +diff -up cmocka-1.1.0/cmake/Modules/DefineCompilerFlags.cmake.than cmocka-1.1.0/cmake/Modules/DefineCompilerFlags.cmake +--- cmocka-1.1.0/cmake/Modules/DefineCompilerFlags.cmake.than 2017-03-27 08:07:21.231279206 -0400 ++++ cmocka-1.1.0/cmake/Modules/DefineCompilerFlags.cmake 2017-03-27 08:08:04.852048525 -0400 +@@ -10,7 +10,7 @@ if (UNIX AND NOT WIN32) + if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") + + # add -Wconversion ? +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -fno-builtin-strcmp -pedantic -pedantic-errors") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute -Wundef") diff --git a/cmocka.spec b/cmocka.spec index 6ac302e..4883d47 100644 --- a/cmocka.spec +++ b/cmocka.spec @@ -4,7 +4,7 @@ BuildRequires: glibc-devel Name: cmocka Version: 1.1.0 -Release: 4%{?dist} +Release: 5%{?dist} License: ASL 2.0 Summary: Lightweight library to simplify and generalize unit tests for C @@ -12,6 +12,10 @@ Url: http://cmocka.org Source0: https://open.cryptomilk.org/attachments/download/60/%{name}-%{version}.tar.xz +# add workaround for gcc7 on ppc64le temporary before it's fixed in gcc +# https://bugzilla.redhat.com/show_bug.cgi?id=1420350 +Patch1: cmocka-1.1.0-workaround-ppc64le-gcc.patch + %description There are a variety of C unit testing frameworks available however many of them are fairly complex and require the latest compiler technology. Some development @@ -79,6 +83,10 @@ Development headers for the cmocka unit testing library. %prep %setup -q +%ifarch ppc64le +%patch1 -p1 -b .workaround-ppc64le-gcc +%endif + %build if test ! -e "obj"; then mkdir obj @@ -132,6 +140,9 @@ popd %{_libdir}/cmake/cmocka/cmocka-config.cmake %changelog +* Tue Mar 28 2017 Than Ngo - 1.1.0-5 +- added workaround for gcc7 bug on ppc64le temporary + * Fri Feb 10 2017 Fedora Release Engineering - 1.1.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild