William Cohen
parent
0d23da44c5
commit
4caf8758ae
|
|
@ -1,74 +0,0 @@
|
|||
commit c987ff4556596756041fbba315262fbabdd9d1d7
|
||||
Author: Frank Winkler <frankbook@franks-air.localdomain>
|
||||
Date: Fri May 15 10:27:28 2020 +0200
|
||||
|
||||
Generated new configure file with autoconf (2.69) on saturn.
|
||||
|
||||
diff --git a/src/configure b/src/configure
|
||||
index e441d83a9..4b7840080 100755
|
||||
--- a/src/configure
|
||||
+++ b/src/configure
|
||||
@@ -628,6 +628,7 @@ CC_COMMON_NAME
|
||||
BGPM_INSTALL_DIR
|
||||
HAVE_NO_OVERRIDE_INIT
|
||||
FTEST_TARGETS
|
||||
+SDE_ENABLED
|
||||
COMPONENTS
|
||||
COMPONENT_RULES
|
||||
BITFLAGS
|
||||
@@ -5518,8 +5519,10 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
-if test "$static_lib" = "no"; then
|
||||
- as_fn_error $? "Building tests and utilities static but no static papi library to be built" "$LINENO" 5
|
||||
+# Disable LDL AND SDE for static builds
|
||||
+if test "$STATIC" = "-static"; then
|
||||
+ LDL=""
|
||||
+ SDE_ENABLED=
|
||||
fi
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linking with papi shared library of tests and utilities" >&5
|
||||
@@ -5537,6 +5540,14 @@ $as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
+if test "$static_lib" = "no"; then
|
||||
+ shlib_tools=yes
|
||||
+fi
|
||||
+
|
||||
+if test "$static_lib" = "no" -a "$shlib_tools" = "no"; then
|
||||
+ as_fn_error $? "Building tests and utilities static but no static papi library to be built" "$LINENO" 5
|
||||
+fi
|
||||
+
|
||||
if test "$shlib_tools" = "yes"; then
|
||||
if test "$shared_lib" != "yes"; then
|
||||
as_fn_error $? "Building static but specified shared linking for tests and utilities" "$LINENO" 5
|
||||
@@ -5545,6 +5556,8 @@ if test "$shlib_tools" = "yes"; then
|
||||
as_fn_error $? "Building shared but specified static linking" "$LINENO" 5
|
||||
fi
|
||||
LINKLIB='$(SHLIB)'
|
||||
+ #WORKAROUND: if libpfm cannot be found at link time
|
||||
+ LDFLAGS="$LDFLAGS -Wl,-rpath-link,$PWD/libpfm4/lib"
|
||||
elif test "$shlib_tools" = "no"; then
|
||||
if test "$static_lib" != "yes"; then
|
||||
as_fn_error $? "Building shared but specified static linking for tests and utilities" "$LINENO" 5
|
||||
@@ -6850,8 +6863,10 @@ tests="$tests comp_tests"
|
||||
# check for SDE component to determine if we need -lrt in LDFLAGS
|
||||
for comp in $components; do
|
||||
if test "x$comp" = "xsde" ; then
|
||||
+ CFLAGS="$CFLAGS -DSDE"
|
||||
LDFLAGS="$LDFLAGS $LRT"
|
||||
LIBS="$LIBS $LRT"
|
||||
+ SDE_ENABLED=1
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -6953,6 +6968,7 @@ $as_echo "$PAPI_EVENTS_CSV" >&6; }
|
||||
|
||||
|
||||
|
||||
+
|
||||
|
||||
|
||||
if test "$cross_compiling" = "yes" ; then
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
commit d407d4445114e8db673fe3fe83b3cf1655dbe776
|
||||
Author: William Cohen <wcohen@redhat.com>
|
||||
Date: Thu Jan 21 14:48:01 2021 -0500
|
||||
|
||||
Only check for libpfm.a if static libraries are being used.
|
||||
|
||||
Even when static libraries are not be used papi was checking for
|
||||
libpfm.a, this would cause a failure if libpfm.a wasn't installed.
|
||||
Exclude checking for libpfm.a if no static libpfm library is needed.
|
||||
|
||||
diff --git a/src/Rules.pfm4_pe b/src/Rules.pfm4_pe
|
||||
index 61eedc8a3..65a9635c6 100644
|
||||
--- a/src/Rules.pfm4_pe
|
||||
+++ b/src/Rules.pfm4_pe
|
||||
@@ -32,6 +32,7 @@ ifeq (yes,$(MIC))
|
||||
FORCE_PFM_ARCH="CONFIG_PFMLIB_ARCH_X86=y"
|
||||
endif
|
||||
|
||||
+ifneq (,$(STATIC))
|
||||
ifeq (,$(PFM_OBJS))
|
||||
$(PFM_LIB_PATH)/libpfm.a:
|
||||
ifneq (,${PFM_ROOT})
|
||||
@@ -49,6 +50,7 @@ else
|
||||
endif
|
||||
$(MAKE)
|
||||
endif
|
||||
+endif
|
||||
|
||||
include Makefile.inc
|
||||
|
||||
28
papi.spec
28
papi.spec
|
|
@ -1,5 +1,3 @@
|
|||
# Default to no static libraries
|
||||
%{!?with_static: %global with_static 0}
|
||||
%bcond_with bundled_libpfm
|
||||
# rdma is not available
|
||||
%ifarch %{arm}
|
||||
|
|
@ -11,7 +9,7 @@
|
|||
Summary: Performance Application Programming Interface
|
||||
Name: papi
|
||||
Version: 6.0.0
|
||||
Release: 6%{?dist}
|
||||
Release: 5%{?dist}
|
||||
License: BSD
|
||||
Requires: papi-libs = %{version}-%{release}
|
||||
URL: http://icl.cs.utk.edu/papi/
|
||||
|
|
@ -19,8 +17,6 @@ Source0: http://icl.cs.utk.edu/projects/papi/downloads/%{name}-%{version}.tar.gz
|
|||
Patch1: papi-python3.patch
|
||||
Patch2: papi-a64fx.patch
|
||||
Patch3: papi-no-iozone.patch
|
||||
Patch4: papi-config.patch
|
||||
Patch5: papi-nostatic.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: ncurses-devel
|
||||
|
|
@ -30,10 +26,8 @@ BuildRequires: chrpath
|
|||
BuildRequires: lm_sensors-devel
|
||||
%if %{without bundled_libpfm}
|
||||
BuildRequires: libpfm-devel >= 4.6.0-1
|
||||
%if %{with_static}
|
||||
BuildRequires: libpfm-static >= 4.6.0-1
|
||||
%endif
|
||||
%endif
|
||||
# Following required for net component
|
||||
BuildRequires: net-tools
|
||||
%if %{with_rdma}
|
||||
|
|
@ -76,22 +70,18 @@ Requires: papi-libs = %{version}-%{release}
|
|||
PAPI-testsuite includes compiled versions of papi tests to ensure
|
||||
that PAPI functions on particular hardware.
|
||||
|
||||
%if %{with_static}
|
||||
%package static
|
||||
Summary: Static libraries for the compiling programs with PAPI
|
||||
Requires: papi = %{version}-%{release}
|
||||
%description static
|
||||
PAPI-static includes the static versions of the library files for
|
||||
the PAPI user-space libraries and interfaces.
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .python3
|
||||
%patch2 -p1 -b .a64fx
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
# This package fails to build with LTO due to undefined symbols. LTO
|
||||
|
|
@ -105,12 +95,6 @@ the PAPI user-space libraries and interfaces.
|
|||
%global libpfm_config --with-pfm-incdir=%{_includedir} --with-pfm-libdir=%{_libdir}
|
||||
%endif
|
||||
|
||||
%if %{with_static}
|
||||
%global static_lib_config --with-static-lib=yes
|
||||
%else
|
||||
%global static_lib_config --with-static-lib=no
|
||||
%endif
|
||||
|
||||
# set up environment variable for the various components
|
||||
# cuda
|
||||
# host_micpower
|
||||
|
|
@ -129,9 +113,8 @@ cd src
|
|||
autoconf
|
||||
%configure --with-perf-events \
|
||||
%{?libpfm_config} \
|
||||
%{?static_lib_config} \
|
||||
--with-shared-lib=yes --with-shlib --with-shlib-tools \
|
||||
--with-components="appio coretemp example infiniband lmsensors lustre micpower mx net %{?pcp_enable} rapl stealtime"
|
||||
--with-static-lib=yes --with-shared-lib=yes --with-shlib --with-shlib-tools \
|
||||
--with-components="appio coretemp example infiniband lmsensors lustre micpower mx net %{?pcp_enable} rapl sde stealtime"
|
||||
# implicit enabled components: perf_event perf_event_uncore
|
||||
#components currently left out because of build configure/build issues
|
||||
# --with-components="bgpm coretemp_freebsd cuda host_micpower nvml vmware"
|
||||
|
|
@ -183,15 +166,10 @@ chrpath --delete $RPM_BUILD_ROOT%{_libdir}/*.so*
|
|||
/usr/share/papi/components
|
||||
/usr/share/papi/testlib
|
||||
|
||||
%if %{with_static}
|
||||
%files static
|
||||
%{_libdir}/*.a
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Jan 22 2021 William Cohen <wcohen@redhat.com> - 6.0.0-6
|
||||
- By default disable genaration of static libraries.
|
||||
|
||||
* Thu Dec 17 2020 William Cohen <wcohen@redhat.com> - 6.0.0-5
|
||||
- Remove iozone source code. (#1901077)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue