diff options
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | papi-utils-ldpath-fix.patch | 63 |
3 files changed, 12 insertions, 80 deletions
@@ -1,24 +1,22 @@ pkgbase = papi-cuda pkgdesc = Performance Application Programming Interface (with CUDA componet) - pkgver = 5.7.0 + pkgver = 6.0.0 pkgrel = 1 url = http://icl.cs.utk.edu/papi/ arch = x86_64 arch = i686 license = BSD - depends = glibc + depends = python depends = gcc-fortran depends = cuda optdepends = openmpi: for MPI applications - provides = papi=5.7.0 + provides = papi=6.0.0 conflicts = papi conflicts = libpfm4 - source = http://icl.cs.utk.edu/projects/papi/downloads/papi-5.7.0.tar.gz + source = http://icl.cs.utk.edu/projects/papi/downloads/papi-6.0.0.tar.gz source = cuda-component-build-targets.patch - source = papi-utils-ldpath-fix.patch - sha256sums = d1a3bb848e292c805bc9f29e09c27870e2ff4cda6c2fba3b7da8b4bba6547589 + sha256sums = 3442709dae3405c2845b304c06a8b15395ecf4f3899a89ceb4d715103cb4055f sha256sums = 0b93df095425fd5d5a9166bb4d62a71a9ab62708b9364cb9da4193d2b60a890f - sha256sums = d9658f3f950d398b62138d82340b5ef2b5aa79774665e8c634cf5c320a43220d pkgname = papi-cuda @@ -3,7 +3,7 @@ # Contributor: jedbrown pkgname=papi-cuda -pkgver=5.7.0 +pkgver=6.0.0 pkgrel=1 pkgdesc='Performance Application Programming Interface (with CUDA componet)' arch=('x86_64' 'i686') @@ -11,22 +11,18 @@ url='http://icl.cs.utk.edu/papi/' license=('BSD') provides=("papi=${pkgver}") conflicts=('papi' 'libpfm4') -depends=('glibc' 'gcc-fortran' 'cuda') +depends=('python' 'gcc-fortran' 'cuda') optdepends=('openmpi: for MPI applications') source=("http://icl.cs.utk.edu/projects/papi/downloads/papi-${pkgver}.tar.gz" - 'cuda-component-build-targets.patch' - 'papi-utils-ldpath-fix.patch') -sha256sums=('d1a3bb848e292c805bc9f29e09c27870e2ff4cda6c2fba3b7da8b4bba6547589' - '0b93df095425fd5d5a9166bb4d62a71a9ab62708b9364cb9da4193d2b60a890f' - 'd9658f3f950d398b62138d82340b5ef2b5aa79774665e8c634cf5c320a43220d') + 'cuda-component-build-targets.patch') +sha256sums=('3442709dae3405c2845b304c06a8b15395ecf4f3899a89ceb4d715103cb4055f' + '0b93df095425fd5d5a9166bb4d62a71a9ab62708b9364cb9da4193d2b60a890f') prepare() { cd "${srcdir}/papi-${pkgver}/src" # resolve issue with NVCC not understand `-Wl` flag patch -p1 < $srcdir/cuda-component-build-targets.patch - # resolve problem with LDPATHS placed at wrong point in CC commandline - patch -p1 < $srcdir/papi-utils-ldpath-fix.patch } build() { @@ -34,6 +30,7 @@ build() { export CFLAGS="-fPIC ${CFLAGS}" export CC=gcc # for systems with other CC installed + export F77=gfortran # for systems with other FC installed export CUDA_DIR=/opt/cuda export CUPTI_DIR=/opt/cuda/extras/CUPTI ./configure \ @@ -58,5 +55,5 @@ package() { make DESTDIR="${pkgdir}" install chmod 644 $pkgdir/usr/share/papi/papi_events.csv install -Dm644 ${srcdir}/papi-${pkgver}/LICENSE.txt \ - ${pkgdir}/usr/share/licenses/papi/LICENSE + ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE } diff --git a/papi-utils-ldpath-fix.patch b/papi-utils-ldpath-fix.patch deleted file mode 100644 index a944a6cb66f0..000000000000 --- a/papi-utils-ldpath-fix.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- src/utils/Makefile 2019-06-28 16:59:26.789420640 +0100 -+++ src/utils/Makefile 2019-06-28 17:01:48.851325493 +0100 -@@ -16,46 +16,46 @@ - default all utils: $(ALL) - - papi_avail: papi_avail.o $(PAPILIB) print_header.o -- $(CC) $(LDFLAGS) -o papi_avail papi_avail.o print_header.o $(PAPILIB) -+ $(CC) -o papi_avail papi_avail.o print_header.o $(PAPILIB) $(LDFLAGS) - - papi_clockres: papi_clockres.o $(PAPILIB) $(CLOCKCORE) -- $(CC) $(LDFLAGS) -o papi_clockres papi_clockres.o $(PAPILIB) $(CLOCKCORE) -lm -+ $(CC) -o papi_clockres papi_clockres.o $(PAPILIB) $(CLOCKCORE) -lm $(LDFLAGS) - - papi_command_line: papi_command_line.o $(PAPILIB) $(DOLOOPS) -- $(CC) $(LDFLAGS) -o papi_command_line papi_command_line.o $(PAPILIB) $(DOLOOPS) -+ $(CC) -o papi_command_line papi_command_line.o $(PAPILIB) $(DOLOOPS) $(LDFLAGS) - - papi_component_avail: papi_component_avail.o $(PAPILIB) print_header.o -- $(CC) $(LDFLAGS) -o papi_component_avail papi_component_avail.o $(PAPILIB) print_header.o -+ $(CC) -o papi_component_avail papi_component_avail.o $(PAPILIB) print_header.o $(LDFLAGS) - - papi_cost: papi_cost.o $(PAPILIB) cost_utils.o -- $(CC) $(LDFLAGS) -o papi_cost papi_cost.o cost_utils.o $(PAPILIB) -lm -+ $(CC) -o papi_cost papi_cost.o cost_utils.o $(PAPILIB) -lm $(LDFLAGS) - - papi_decode: papi_decode.o $(PAPILIB) -- $(CC) $(LDFLAGS) -o papi_decode papi_decode.o $(PAPILIB) -+ $(CC) -o papi_decode papi_decode.o $(PAPILIB) $(LDFLAGS) - - papi_error_codes: papi_error_codes.o $(PAPILIB) -- $(CC) $(LDFLAGS) -o papi_error_codes papi_error_codes.o $(PAPILIB) -+ $(CC) -o papi_error_codes papi_error_codes.o $(PAPILIB) $(LDFLAGS) - - papi_event_chooser: papi_event_chooser.o $(PAPILIB) print_header.o -- $(CC) $(LDFLAGS) -o papi_event_chooser papi_event_chooser.o print_header.o $(PAPILIB) -+ $(CC) -o papi_event_chooser papi_event_chooser.o print_header.o $(PAPILIB) $(LDFLAGS) - - papi_hybrid_native_avail: papi_hybrid_native_avail.o $(PAPILIB) -- $(CC) $(LDFLAGS) -o papi_hybrid_native_avail papi_hybrid_native_avail.o $(PAPILIB) -+ $(CC) -o papi_hybrid_native_avail papi_hybrid_native_avail.o $(PAPILIB) $(LDFLAGS) - - papi_mem_info: papi_mem_info.o $(PAPILIB) -- $(CC) $(LDFLAGS) -o papi_mem_info papi_mem_info.o $(PAPILIB) -+ $(CC) -o papi_mem_info papi_mem_info.o $(PAPILIB) $(LDFLAGS) - - papi_multiplex_cost: papi_multiplex_cost.o $(PAPILIB) cost_utils.o -- $(CC) $(LDFLAGS) -o papi_multiplex_cost papi_multiplex_cost.o cost_utils.o $(PAPILIB) -lm -+ $(CC) -o papi_multiplex_cost papi_multiplex_cost.o cost_utils.o $(PAPILIB) -lm $(LDFLAGS) - - papi_native_avail: papi_native_avail.o $(PAPILIB) print_header.o -- $(CC) $(LDFLAGS) -o papi_native_avail papi_native_avail.o $(PAPILIB) print_header.o -+ $(CC) -o papi_native_avail papi_native_avail.o $(PAPILIB) print_header.o $(LDFLAGS) - - papi_version: papi_version.o $(PAPILIB) -- $(CC) $(LDFLAGS) -o papi_version papi_version.o $(PAPILIB) -+ $(CC) -o papi_version papi_version.o $(PAPILIB) $(LDFLAGS) - - papi_xml_event_info: papi_xml_event_info.o $(PAPILIB) -- $(CC) $(LDFLAGS) -o papi_xml_event_info papi_xml_event_info.o $(PAPILIB) -+ $(CC) -o papi_xml_event_info papi_xml_event_info.o $(PAPILIB) $(LDFLAGS) - - - |