rpms/papi
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Unbundle libpfm from papi.

Browse Source
This commit is contained in:
William Cohen 2012-06-11 10:56:20 -04:00
parent d7a1fea46b
commit a576b22c6a
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
papi.spec
View File

@ -1,7 +1,8 @@
%bcond_with bundled_libpfm
Summary: Performance Application Programming Interface Summary: Performance Application Programming Interface
Name: papi Name: papi
Version: 4.4.0 Version: 4.4.0
Release: 1%{?dist} Release: 2%{?dist}
License: BSD License: BSD
Group: Development/System Group: Development/System
URL: http://icl.cs.utk.edu/papi/ URL: http://icl.cs.utk.edu/papi/
@ -12,6 +13,9 @@ BuildRequires: gcc-gfortran
BuildRequires: kernel-headers >= 2.6.32 BuildRequires: kernel-headers >= 2.6.32
BuildRequires: chrpath BuildRequires: chrpath
BuildRequires: lm_sensors-devel BuildRequires: lm_sensors-devel
%if %{without bundled_libpfm}
BuildRequires: libpfm-devel
%endif
# Following required for net component # Following required for net component
BuildRequires: net-tools BuildRequires: net-tools
# Following required for inifiband component # Following required for inifiband component
@ -28,7 +32,7 @@ Summary: Header files for the compiling programs with PAPI
Group: Development/System Group: Development/System
Requires: papi = %{version}-%{release} Requires: papi = %{version}-%{release}
%description devel %description devel
PAPI-devel includes the C header files that specify the PAPI userspace PAPI-devel includes the C header files that specify the PAPI user-space
libraries and interfaces. This is required for rebuilding any program libraries and interfaces. This is required for rebuilding any program
that uses PAPI. that uses PAPI.
@ -38,14 +42,20 @@ Group: Development/System
Requires: papi = %{version}-%{release} Requires: papi = %{version}-%{release}
%description static %description static
PAPI-static includes the static versions of the library files for PAPI-static includes the static versions of the library files for
the PAPI userspace libraries and interfaces. the PAPI user-space libraries and interfaces.
%prep %prep
%setup -q %setup -q
%build %build
%if %{without bundled_libpfm}
# Build our own copy of libpfm.
%global libpfm_config --with-pfm-incdir=%{_includedir}/perfmon --with-pfm-libdir=%{_libdir}
%endif
cd src cd src
%configure --with-libpfm4 \ %configure --with-libpfm4 \
%{?libpfm_config} \
--with-static-lib=yes --with-shared-lib=yes --with-shlib \ --with-static-lib=yes --with-shared-lib=yes --with-shlib \
--with-components="coretemp example lmsensors lustre mx net" --with-components="coretemp example lmsensors lustre mx net"
#components currently left out because of build configure/build issues #components currently left out because of build configure/build issues
@ -64,10 +74,6 @@ popd
#DBG workaround to make sure libpfm just uses the normal CFLAGS #DBG workaround to make sure libpfm just uses the normal CFLAGS
DBG="" make %{?_smp_mflags} DBG="" make %{?_smp_mflags}
#%check
#cd src
#make fulltest
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
cd src cd src
@ -91,7 +97,9 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_includedir}/*.h %{_includedir}/*.h
%if %{with bundled_libpfm}
%{_includedir}/perfmon/*.h %{_includedir}/perfmon/*.h
%endif
%{_libdir}/*.so %{_libdir}/*.so
%doc %{_mandir}/man3/* %doc %{_mandir}/man3/*
@ -100,6 +108,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.a %{_libdir}/*.a
%changelog %changelog
* Mon Jun 11 2012 William Cohen <wcohen@redhat.com> - 4.4.0-2
- Unbundle libpfm4 from papi.
- Correct description spellings.
- Remove unused test section.
* Fri Apr 20 2012 William Cohen <wcohen@redhat.com> - 4.4.0-1 * Fri Apr 20 2012 William Cohen <wcohen@redhat.com> - 4.4.0-1
- Rebase to 4.4.0. - Rebase to 4.4.0.