Compare commits

...

18 Commits
f23 ... master

Author SHA1 Message Date
William Cohen
c033ad4d7c Dynamically link utilities and tests to papi libraries. 2018-05-17 15:52:28 -04:00
William Cohen
0d368b884a Resolve: rhbz#1573096 2018-04-30 14:11:10 -04:00
Igor Gnatenko
4139b24f09
Remove %clean section
None of currently supported distributions need that.
Last one was EL5 which is EOL for a while.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-14 08:28:21 +01:00
Igor Gnatenko
f96f6dbb4c Remove BuildRoot definition
None of currently supported distributions need that.
It was needed last for EL5 which is EOL now

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-02-13 23:59:30 +01:00
Fedora Release Engineering
dba3783cc5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 18:17:15 +00:00
William Cohen
b25844b844 Bump and rebuild for libgfortran.so.5 dependency. 2018-01-31 08:29:35 -05:00
William Cohen
e7b7e927c3 Fix the infiniband build requires. 2017-12-21 19:06:51 -05:00
William Cohen
3e94b266fa Rebase to papi-5.6.0.tar.gz 2017-12-21 18:20:13 -05:00
Honggang LI
db9186f7bd Disable RDMA support on ARM32 2017-08-28 08:19:08 +02:00
Fedora Release Engineering
319c849ab1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 04:50:06 +00:00
Fedora Release Engineering
5aa2d3bc6f - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 02:10:30 +00:00
Fedora Release Engineering
3b9504b771 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 01:15:20 +00:00
William Cohen
a3639f1529 Bump version and rebuild due to new libgfortan.so version. 2017-02-02 14:20:41 -05:00
William Cohen
b20ce17773 Rebase to papi-5.5.1. 2016-11-18 16:54:06 -05:00
William Cohen
5892c9cec0 Rebase to papi-5.5.0. 2016-09-14 16:46:12 -04:00
Petr Písař
a721c87573 Mandatory Perl build-requires added <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl> 2016-06-24 10:23:14 +02:00
Fedora Release Engineering
80a7c97f88 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 11:54:31 +00:00
William Cohen
e23f0966d4 Rebase to papi-5.4.3.tar.gz. 2016-01-26 14:01:27 -05:00
4 changed files with 184 additions and 14 deletions

4
.gitignore vendored
View File

@ -18,3 +18,7 @@ papi-4.1.0.tar.gz
/papi-5.3.2.tar.gz /papi-5.3.2.tar.gz
/papi-5.4.0.tar.gz /papi-5.4.0.tar.gz
/papi-5.4.1.tar.gz /papi-5.4.1.tar.gz
/papi-5.4.3.tar.gz
/papi-5.5.0.tar.gz
/papi-5.5.1.tar.gz
/papi-5.6.0.tar.gz

115
papi-ldflags.patch Normal file
View File

@ -0,0 +1,115 @@
commit bde3da26f1f2755689e16fc9f5ab404367d1fdc8
Author: Vince Weaver <vincent.weaver@maine.edu>
Date: Wed Jan 24 14:13:28 2018 -0500
build: fix various LDFLAGS/CFLAGS issues
issues were reported by Andreas Beckmann <anbe@debian.org>
diff --git a/src/components/Makefile_comp_tests.target.in b/src/components/Makefile_comp_tests.target.in
index 9a369adb..a4412bea 100644
--- a/src/components/Makefile_comp_tests.target.in
+++ b/src/components/Makefile_comp_tests.target.in
@@ -9,7 +9,7 @@ INCLUDE = -I. -I@includedir@ -I$(datadir) -I$(testlibdir) -I$(validationlibdir)
LIBDIR = @libdir@
PAPILIB = $(datadir)/@LIBRARY@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@
+LDFLAGS = @LDFLAGS@ @LDL@
CC = @CC@
F77 = @F77@
CC_R = @CC_R@
diff --git a/src/components/perf_event_uncore/tests/Makefile b/src/components/perf_event_uncore/tests/Makefile
index 3ee8fc2a..d70debe6 100644
--- a/src/components/perf_event_uncore/tests/Makefile
+++ b/src/components/perf_event_uncore/tests/Makefile
@@ -17,19 +17,19 @@ perf_event_uncore_lib.o: perf_event_uncore_lib.c perf_event_uncore_lib.h
perf_event_amd_northbridge: perf_event_amd_northbridge.o $(DOLOOPS) $(UTILOBJS) $(PAPILIB) $(DOLOOPS)
- $(CC) $(LFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o perf_event_amd_northbridge perf_event_amd_northbridge.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
perf_event_uncore: perf_event_uncore.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o
- $(CC) $(LFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o perf_event_uncore perf_event_uncore.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
perf_event_uncore_attach: perf_event_uncore_attach.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) perf_event_uncore_lib.o
- $(CC) $(LFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) -o perf_event_uncore_attach perf_event_uncore_attach.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
perf_event_uncore_multiple: perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB)
- $(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_multiple perf_event_uncore_multiple.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
perf_event_uncore_cbox: perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB)
- $(CC) $(LFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
+ $(CC) $(CFLAGS) $(INCLUDE) -o perf_event_uncore_cbox perf_event_uncore_cbox.o perf_event_uncore_lib.o $(UTILOBJS) $(DOLOOPS) $(PAPILIB) $(LDFLAGS)
diff --git a/src/ctests/Makefile.recipies b/src/ctests/Makefile.recipies
index 63c107c0..201f3c85 100644
--- a/src/ctests/Makefile.recipies
+++ b/src/ctests/Makefile.recipies
@@ -350,7 +350,7 @@ code2name: code2name.c $(TESTLIB) $(PAPILIB)
$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) code2name.c $(TESTLIB) $(PAPILIB) $(LDFLAGS) -o code2name
attach_target: attach_target.c $(DOLOOPS)
- -$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB)
+ -$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) attach_target.c -o attach_target $(DOLOOPS) $(TESTLIB) $(LDFLAGS)
zero_attach: zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB)
-$(CC) $(INCLUDE) $(CFLAGS) $(TOPTFLAGS) zero_attach.c $(TESTLIB) $(DOLOOPS) $(PAPILIB) $(LDFLAGS) -o zero_attach
diff --git a/src/ctests/Makefile.target.in b/src/ctests/Makefile.target.in
index bb51c350..fcc3373b 100644
--- a/src/ctests/Makefile.target.in
+++ b/src/ctests/Makefile.target.in
@@ -12,7 +12,7 @@ LIBRARY=@LIBRARY@
SHLIB=@SHLIB@
PAPILIB = ../@LINKLIB@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
CC = @CC@
MPICC = @MPICC@
F77 = @F77@
diff --git a/src/ftests/Makefile.target.in b/src/ftests/Makefile.target.in
index 718586e5..8006dd8d 100644
--- a/src/ftests/Makefile.target.in
+++ b/src/ftests/Makefile.target.in
@@ -11,7 +11,7 @@ LIBRARY = @LIBRARY@
SHLIB=@SHLIB@
PAPILIB = ../@LINKLIB@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@
+LDFLAGS = @LDFLAGS@ @LDL@
CC = @CC@
F77 = @F77@
CC_R = @CC_R@
diff --git a/src/utils/Makefile.target.in b/src/utils/Makefile.target.in
index a5eab438..58d438a1 100644
--- a/src/utils/Makefile.target.in
+++ b/src/utils/Makefile.target.in
@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@
SHLIB=@SHLIB@
PAPILIB = ../@LINKLIB@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
CC = @CC@
MPICC = @MPICC@
F77 = @F77@
diff --git a/src/validation_tests/Makefile.target.in b/src/validation_tests/Makefile.target.in
index a5eab438..58d438a1 100644
--- a/src/validation_tests/Makefile.target.in
+++ b/src/validation_tests/Makefile.target.in
@@ -11,7 +11,7 @@ LIBRARY=@LIBRARY@
SHLIB=@SHLIB@
PAPILIB = ../@LINKLIB@
TESTLIB = $(testlibdir)/libtestlib.a
-LDFLAGS = @LDL@ @STATIC@
+LDFLAGS = @LDFLAGS@ @LDL@ @STATIC@
CC = @CC@
MPICC = @MPICC@
F77 = @F77@

View File

@ -1,14 +1,20 @@
%bcond_with bundled_libpfm %bcond_with bundled_libpfm
# rdma is not available
%ifarch %{arm}
%{!?with_rdma: %global with_rdma 0}
%else
%{!?with_rdma: %global with_rdma 1}
%endif
Summary: Performance Application Programming Interface Summary: Performance Application Programming Interface
Name: papi Name: papi
Version: 5.4.1 Version: 5.6.0
Release: 3%{?dist} Release: 6%{?dist}
License: BSD License: BSD
Group: Development/System Group: Development/System
Requires: papi-libs = %{version}-%{release} Requires: papi-libs = %{version}-%{release}
URL: http://icl.cs.utk.edu/papi/ URL: http://icl.cs.utk.edu/papi/
Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Patch1: papi-ldflags.patch
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
@ -22,8 +28,12 @@ BuildRequires: libpfm-static >= 4.6.0-1
%endif %endif
# Following required for net component # Following required for net component
BuildRequires: net-tools BuildRequires: net-tools
%if %{with_rdma}
# Following required for inifiband component # Following required for inifiband component
BuildRequires: libibmad-devel BuildRequires: rdma-core-devel
BuildRequires: infiniband-diags-devel
%endif
BuildRequires: perl-generators
#Right now libpfm does not know anything about s390 and will fail #Right now libpfm does not know anything about s390 and will fail
ExcludeArch: s390 s390x ExcludeArch: s390 s390x
@ -66,6 +76,7 @@ the PAPI user-space libraries and interfaces.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .ldflags
%build %build
%if %{without bundled_libpfm} %if %{without bundled_libpfm}
@ -77,7 +88,7 @@ cd src
autoconf autoconf
%configure --with-perf-events \ %configure --with-perf-events \
%{?libpfm_config} \ %{?libpfm_config} \
--with-static-lib=yes --with-shared-lib=yes --with-shlib \ --with-static-lib=yes --with-shared-lib=yes --with-shlib --with-shlib-tools \
--with-components="appio coretemp example infiniband lmsensors lustre micpower mx net rapl stealtime" --with-components="appio coretemp example infiniband lmsensors lustre micpower mx net rapl stealtime"
# implicit enabled components: perf_event perf_event_uncore # implicit enabled components: perf_event perf_event_uncore
#components currently left out because of build configure/build issues #components currently left out because of build configure/build issues
@ -86,7 +97,9 @@ autoconf
pushd components pushd components
#pushd cuda; ./configure; popd #pushd cuda; ./configure; popd
#pushd host_micpower; ./configure; popd #pushd host_micpower; ./configure; popd
%if %{with_rdma}
pushd infiniband_umad; %configure; popd pushd infiniband_umad; %configure; popd
%endif
pushd lmsensors; \ pushd lmsensors; \
%configure --with-sensors_incdir=/usr/include/sensors \ %configure --with-sensors_incdir=/usr/include/sensors \
--with-sensors_libdir=%{_libdir}; \ --with-sensors_libdir=%{_libdir}; \
@ -111,11 +124,7 @@ make DESTDIR=$RPM_BUILD_ROOT LDCONFIG=/bin/true install-all
chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so* chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
%clean
rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-)
%{_bindir}/* %{_bindir}/*
%dir /usr/share/papi %dir /usr/share/papi
/usr/share/papi/papi_events.csv /usr/share/papi/papi_events.csv
@ -126,12 +135,10 @@ rm -rf $RPM_BUILD_ROOT
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%files libs %files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.* %{_libdir}/*.so.*
%doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt %doc INSTALL.txt README LICENSE.txt RELEASENOTES.txt
%files devel %files devel
%defattr(-,root,root,-)
%{_includedir}/*.h %{_includedir}/*.h
%if %{with bundled_libpfm} %if %{with bundled_libpfm}
%{_includedir}/perfmon/*.h %{_includedir}/perfmon/*.h
@ -141,18 +148,62 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_mandir}/man3/* %doc %{_mandir}/man3/*
%files testsuite %files testsuite
%defattr(-,root,root,-)
/usr/share/papi/run_tests* /usr/share/papi/run_tests*
/usr/share/papi/ctests /usr/share/papi/ctests
/usr/share/papi/ftests /usr/share/papi/ftests
/usr/share/papi/validation_tests
/usr/share/papi/components /usr/share/papi/components
/usr/share/papi/testlib /usr/share/papi/testlib
%files static %files static
%defattr(-,root,root,-)
%{_libdir}/*.a %{_libdir}/*.a
%changelog %changelog
* Thu May 17 2018 William Cohen <wcohen@redhat.com> - 5.6.0-6
- Dynamically link utilities and tests to papi libraries.
* Mon Apr 30 2018 William Cohen <wcohen@redhat.com> - 5.6.0-5
- Include various LDFLAGS/CFLAGS.
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.6.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jan 31 2018 William Cohen <wcohen@redhat.com> - 5.6.0-3
- Bump and rebuild.
* Thu Dec 21 2017 William Cohen <wcohen@redhat.com> - 5.6.0-2
- Correct infiniband buildrequires.
* Thu Dec 21 2017 William Cohen <wcohen@redhat.com> - 5.6.0-1
- Rebase to papi-5.6.0.
* Mon Aug 28 2017 Honggang LI <honli@redhat.com> - 5.5.1-6
- Disable RDMA support on ARM32
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 2 2017 William Cohen <wcohen@redhat.com> - 5.5.1-2
- Bump version and rebuild due to new libgfortan.so version.
* Fri Nov 18 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-1
- Rebase to papi-5.5.1.
* Wed Sep 14 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-1
- Rebase to papi-5.5.0.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 5.4.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jan 26 2016 William Cohen <wcohen@redhat.com> - 5.4.3-1
- Rebase to papi-5.4.3.
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.1-3 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.4.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

View File

@ -1 +1 @@
9134a99219c79767a11463a76b0b01a2 papi-5.4.1.tar.gz SHA512 (papi-5.6.0.tar.gz) = b2a1536f220081d08ee9bc94fddbf422e36c60c55b0536bc43dec074bdaf23afaedbdd755b7e6af25c4c0ce582cc7ad4c59e2adc1801e75c482d472b080439be