Fix build failure on SLE12-SP4 needlessly introduce by 'download-checker'...

OBS-URL: https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=6
This commit is contained in:
Raymund Will 2018-06-22 15:54:39 +00:00 committed by Git OBS Bridge
parent 0b882be365
commit 86b080af9c
3 changed files with 27 additions and 1 deletions

View File

@ -0,0 +1,18 @@
--- ipmctl-01.00.00.3091.v.d/CMakeLists.txt 2018-05-30 01:54:48.000000000 +0200
+++ ipmctl-01.00.00.3091.tar.d/CMakeLists.txt 2018-06-08 21:25:25.000000000 +0200
@@ -113,9 +113,12 @@
-D_GNU_SOURCE
-D__LINUX__
)
-
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.9)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector-strong")
+ endif()
+ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
+ endif()
endif()
#----------------------------------------------------------------------------------------------------

View File

@ -1,7 +1,13 @@
-------------------------------------------------------------------
Fri Jun 22 15:52:14 UTC 2018 - rw@suse.com
- Fix build failure on SLE12-SP4. [FATE#325527]
(ipmctl-fix-SLE12-build.patch)
-------------------------------------------------------------------
Fri Jun 08 07:28:13 UTC 2018 - juston.li@intel.com
- Release v01.00.00.3091 [FATE#325527]
- Release v01.00.00.3091
-------------------------------------------------------------------
Fri Jun 01 05:39:07 UTC 2018 - juston.li@intel.com

View File

@ -27,6 +27,7 @@ Group: System/Management
Url: https://github.com/intel/ipmctl
Source: https://github.com/intel/ipmctl/archive/v%{version}.tar.gz
Source1: %{name}.rpmlintrc
Patch1: ipmctl-fix-SLE12-build.patch
ExclusiveArch: x86_64
Requires: libipmctl2%{?_isa} = %{version}-%{release}
@ -49,6 +50,7 @@ Debug and troubleshoot PMMs.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%package -n ipmctl-monitor
Summary: Daemon for monitoring the status of Intel PMM