Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gatesgarth-next] Add libpapi.5.7.0 #385

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
From cf23b5c3ba9a4d1e9589e777e02195725feea402 Mon Sep 17 00:00:00 2001
From: Olivier Georget <[email protected]>
Date: Wed, 23 Jun 2021 14:00:50 +0200
Subject: [PATCH] Remove useless rpath to validate do_package_qa

---
src/components/Makefile_comp_tests.target.in | 2 +-
src/configure.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Makefile_comp_tests.target.in b/src/components/Makefile_comp_tests.target.in
index 76b14683e..e661b361c 100644
--- a/src/components/Makefile_comp_tests.target.in
+++ b/src/components/Makefile_comp_tests.target.in
@@ -5,7 +5,7 @@ datarootdir = @datarootdir@
datadir = ../../..
testlibdir = $(datadir)/testlib
validationlibdir = $(datadir)/validation_tests
-INCLUDE = -I. -I@includedir@ -I$(datadir) -I$(testlibdir) -I$(validationlibdir)
+INCLUDE = -I. -I$(datadir) -I$(testlibdir) -I$(validationlibdir)
LIBDIR = @libdir@
LIBRARY = @LIBRARY@
SHLIB = @SHLIB@
diff --git a/src/configure.in b/src/configure.in
index e263d433f..7daab8dc3 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1265,7 +1265,7 @@ SHLIB='libpapi.so.AC_PACKAGE_VERSION'
VLIB='libpapi.so.$(PAPIVER)'
OMPCFLGS=-fopenmp
CC_R='$(CC) -pthread'
-CC_SHR='$(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,$(VLIB) -Xlinker "-rpath" -Xlinker "$(LIBDIR)"'
+CC_SHR='$(CC) -fPIC -DPIC -shared -Wl,-soname -Wl,$(VLIB) '
if test "$CC_COMMON_NAME" = "gcc"; then
if test "$bitmode" = "32"; then
BITFLAGS=-m32
--
2.17.1

Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
From 2ac707bd4897c715f7f9106a457aca50899f415f Mon Sep 17 00:00:00 2001
From: Olivier Georget <[email protected]>
Date: Wed, 23 Jun 2021 08:36:06 +0200
Subject: [PATCH] Replace plain 'cp' with 'install' mechanism

---
src/Makefile.inc | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 278acdd12..b4e8451e4 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -297,17 +297,17 @@ install-lib: native_install
@echo "Headers (INCDIR) being installed in: \"$(DESTDIR)$(INCDIR)\"";
-mkdir -p $(DESTDIR)$(INCDIR)
-chmod go+rx $(DESTDIR)$(INCDIR)
- cp $(FHEADERS) papi.h papiStdEventDefs.h $(DESTDIR)$(INCDIR)
+ install $(FHEADERS) papi.h papiStdEventDefs.h $(DESTDIR)$(INCDIR)
cd $(DESTDIR)$(INCDIR) && chmod go+r $(FHEADERS) papi.h papiStdEventDefs.h
@echo "Libraries (LIBDIR) being installed in: \"$(DESTDIR)$(LIBDIR)\"";
-mkdir -p $(DESTDIR)$(LIBDIR)
-chmod go+rx $(DESTDIR)$(LIBDIR)
@set -ex; if test -r $(LIBRARY) ; then \
- cp $(LIBRARY) $(DESTDIR)$(LIBDIR); \
+ install $(LIBRARY) $(DESTDIR)$(LIBDIR); \
chmod go+r $(DESTDIR)$(LIBDIR)/$(LIBRARY); \
fi
@set -ex; if test -r $(SHLIB) ; then \
- cp -p $(SHLIB) $(DESTDIR)$(LIBDIR)/libpapi.so.$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC); \
+ install $(SHLIB) $(DESTDIR)$(LIBDIR)/libpapi.so.$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC); \
chmod go+r $(DESTDIR)$(LIBDIR)/libpapi.so.$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC) ; \
cd $(DESTDIR)$(LIBDIR); \
ln -sf libpapi.so.$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC) libpapi.so.$(PAPIVER).$(PAPIREV).$(PAPIAGE); \
@@ -326,9 +326,9 @@ install-tests: install-comp_tests
$(SETPATH) $(MAKE) -C ctests install
$(SETPATH) $(MAKE) -C ftests install
$(SETPATH) $(MAKE) -C validation_tests install
- -cp run_tests.sh $(DESTDIR)$(DATADIR)
- -cp run_tests_exclude_cuda.txt $(DESTDIR)$(DATADIR)
- -cp run_tests_exclude.txt $(DESTDIR)$(DATADIR)
+ -install n_tests.sh $(DESTDIR)$(DATADIR)
+ -install run_tests_exclude_cuda.txt $(DESTDIR)$(DATADIR)
+ -install run_tests_exclude.txt $(DESTDIR)$(DATADIR)
-chmod go+rx $(DESTDIR)$(DATADIR)/run_tests.sh
-chmod go+r $(DESTDIR)$(DATADIR)/run_tests_exclude_cuda.txt $(DESTDIR)$(DATADIR)/run_tests_exclude.txt

@@ -344,7 +344,7 @@ install-pkgconf:
@echo "pkcongfig being installed in: \"$(DESTDIR)$(LIBPC)\"";
-mkdir -p $(DESTDIR)$(LIBPC)
-chmod go+rx $(DESTDIR)$(LIBPC)
- cp papi.pc $(DESTDIR)$(LIBPC)/papi-$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC).pc
+ install papi.pc $(DESTDIR)$(LIBPC)/papi-$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC).pc
cd $(DESTDIR)$(LIBPC); ln -sf papi-$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC).pc papi-$(PAPIVER).$(PAPIREV).$(PAPIAGE).pc;
cd $(DESTDIR)$(LIBPC); ln -sf papi-$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC).pc papi-$(PAPIVER).pc;
cd $(DESTDIR)$(LIBPC); ln -sf papi-$(PAPIVER).$(PAPIREV).$(PAPIAGE).$(PAPIINC).pc papi.pc;
--
2.17.1

35 changes: 35 additions & 0 deletions meta-oe/recipes-devtools/papi/papi_5.7.0.bb
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
SUMMARY = "The Performance Application Programming Interface"
DESCRIPTION = "PAPI provides tool designers and application engineers \
with a consistent interface and methodology for the use of low-level \
performance counter hardware found across the entire compute system."
HOMEPAGE = "http://icl.utk.edu/papi/"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c63687a44058f7e489517bc1fa0f6ef4"
SECTION = "devel"

inherit autotools

SRC_URI = "git://bitbucket.org/icl/papi.git;branch=stable-5.7;protocol=https \
file://0001-Replace-plain-cp-with-install-mechanism.patch \
file://0001-Remove-useless-rpath-to-validate-do_package_qa.patch \
"

SRCREV = "e2a4992f2ada87f51a6dbb79bc57293abddef2a1"

S = "${WORKDIR}/git"
B = "${S}/src"
AUTOTOOLS_SCRIPT_PATH = "${B}"

EXTRA_OECONF_append = " \
--with-arch=${TARGET_ARCH} \
--with-ffsll \
--with-walltimer=cycle \
--with-tls=__thread \
--with-virtualtimer=perfctr \
--with-tests='' \
--with-perf-events \
--oldincludedir=${STAGING_INCDIR} \
"

EXTRA_OECONF_append_arm = " --with-CPU=arm"
EXTRA_OECONF_append_aarch64 = " --with-CPU=arm"