- Improve ipmctl-fix-SLE12-build.patch to produce position
independent executables. - Remove hard build dependency on python2. [bsc#1111020] OBS-URL: https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=12
This commit is contained in:
parent
a85be28144
commit
837b5425d0
@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
CMakeLists.txt | 4 ++--
|
CMakeLists.txt | 8 +++++---
|
||||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@ -17,3 +17,21 @@
|
|||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
@@ -376,6 +376,7 @@ if(MSVC)
|
||||||
|
set_target_properties(ipmctl-bin PROPERTIES LINK_FLAGS "/STACK:3000000")
|
||||||
|
else()
|
||||||
|
target_compile_options(ipmctl-bin PRIVATE "-fPIE")
|
||||||
|
+ set_target_properties(ipmctl-bin PROPERTIES LINK_FLAGS "-pie")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
#---------------------------------------------------------------------------------------------------
|
||||||
|
@@ -414,7 +415,8 @@ if (NOT ESX_BUILD)
|
||||||
|
)
|
||||||
|
|
||||||
|
if(UNIX)
|
||||||
|
- target_compile_options(ipmctl-monitor PRIVATE "-fPIE")
|
||||||
|
+ target_compile_options(ipmctl-monitor PRIVATE "-fPIE")
|
||||||
|
+ set_target_properties(ipmctl-monitor PROPERTIES LINK_FLAGS "-pie")
|
||||||
|
endif()
|
||||||
|
|
||||||
|
endif()
|
||||||
|
@ -1,7 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Oct 17 10:24:17 UTC 2018 - rw@suse.com
|
||||||
|
|
||||||
|
- Improve ipmctl-fix-SLE12-build.patch to produce position
|
||||||
|
independent executables.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 10 14:28:25 UTC 2018 - rw@suse.com
|
Wed Oct 10 14:28:25 UTC 2018 - rw@suse.com
|
||||||
|
|
||||||
- Remove build dependency on python2. [bsc#1111020]
|
- Remove hard build dependency on python2. [bsc#1111020]
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Aug 10 15:28:34 UTC 2018 - rw@suse.com
|
Fri Aug 10 15:28:34 UTC 2018 - rw@suse.com
|
||||||
|
@ -28,7 +28,11 @@ Source1: %{name}-rpmlintrc
|
|||||||
Patch1: ipmctl-fix-SLE12-build.patch
|
Patch1: ipmctl-fix-SLE12-build.patch
|
||||||
|
|
||||||
Requires: libipmctl2%{?_isa} = %{version}-%{release}
|
Requires: libipmctl2%{?_isa} = %{version}-%{release}
|
||||||
|
%if %{defined pythons}
|
||||||
BuildRequires: %{pythons}
|
BuildRequires: %{pythons}
|
||||||
|
%else
|
||||||
|
BuildRequires: python2
|
||||||
|
%endif
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user