Accepting request 642597 from hardware:nvdimm
- 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/request/show/642597 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipmctl?expand=0&rev=2
This commit is contained in:
commit
77a85556ca
@ -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,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
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
|
||||||
|
|
||||||
|
- 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
|
||||||
|
|
||||||
|
19
ipmctl.spec
19
ipmctl.spec
@ -15,25 +15,30 @@
|
|||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
Name: ipmctl
|
Name: ipmctl
|
||||||
Version: 01.00.00.3102
|
Version: 01.00.00.3102
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Utility for managing Intel Optane DC persistent memory modules
|
Summary: Utility for managing Intel Optane DC persistent memory modules
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
URL: https://github.com/intel/ipmctl
|
Url: https://github.com/intel/ipmctl
|
||||||
Source: https://github.com/intel/ipmctl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
Source: https://github.com/intel/ipmctl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||||
Source1: %{name}-rpmlintrc
|
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}
|
||||||
|
%else
|
||||||
|
BuildRequires: python2
|
||||||
|
%endif
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: python2
|
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: pkgconfig(libndctl)
|
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
|
BuildRequires: pkgconfig(libndctl)
|
||||||
Obsoletes: ixpdimm-cli < 01.00.00.3000
|
Obsoletes: ixpdimm-cli < 01.00.00.3000
|
||||||
ExclusiveArch: x86_64
|
ExclusiveArch: x86_64
|
||||||
|
|
||||||
@ -48,10 +53,6 @@ Supports functionality to:
|
|||||||
* Track performance of PMMs.
|
* Track performance of PMMs.
|
||||||
* Debug and troubleshoot PMMs.
|
* Debug and troubleshoot PMMs.
|
||||||
|
|
||||||
%prep
|
|
||||||
%setup -q -n %{name}-%{version}
|
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
%package -n ipmctl-monitor
|
%package -n ipmctl-monitor
|
||||||
Summary: Daemon for monitoring the status of Intel PMM
|
Summary: Daemon for monitoring the status of Intel PMM
|
||||||
Group: System/Monitoring
|
Group: System/Monitoring
|
||||||
@ -94,6 +95,10 @@ Obsoletes: ixpdimm_sw-devel < 01.00.00.3000
|
|||||||
%description -n ipmctl-devel
|
%description -n ipmctl-devel
|
||||||
API for development of Intel Optane DC persistent memory management utilities.
|
API for development of Intel Optane DC persistent memory management utilities.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n %{name}-%{version}
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%cmake -DBUILDNUM=%{version} -DCMAKE_INSTALL_PREFIX=/ \
|
%cmake -DBUILDNUM=%{version} -DCMAKE_INSTALL_PREFIX=/ \
|
||||||
-DLINUX_PRODUCT_NAME=%{name} \
|
-DLINUX_PRODUCT_NAME=%{name} \
|
||||||
|
Loading…
Reference in New Issue
Block a user