Update to 4.0.2.20230303.

Note that issue #27 is now partially fixed upstream in
commit f33ddf932602d8db07da7c4a52c0f66e89c29224.

4 files changed, 60 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4fb95e5fe42..9c40845fbdca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = extrae
 	pkgdesc = Instrumentation framework to generate execution traces of the most used parallel runtimes (from BSC).
-	pkgver = 4.0.1.20220513
-	pkgrel = 4
+	pkgver = 4.0.2.20230303
+	pkgrel = 1
 	url = https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools
 	arch = i686
 	arch = x86_64
@@ -12,11 +12,13 @@ pkgbase = extrae
 	depends = libxml2
 	depends = zlib
 	depends = python
-	source = https://github.com/bsc-performance-tools/extrae/archive/4.0.1.tar.gz
+	source = https://github.com/bsc-performance-tools/extrae/archive/4.0.2.tar.gz
 	source = extrae-issue-27-fix-pie-address-translation.patch
+	source = extrae-Fix-make-DESTDIR-.-install-for-Extrae-4.0.2.patch
 	source = extrae-Fix-references-to-the-build-directory.patch
-	sha512sums = 58cbe06b1eb738dba3c9d38a96ca8a9bf442c492214e086876af25b8d7e01c379b46281f6815763e87e0e69214636f95486d48b1b6ce088b54d24b4d77ff0920
-	sha512sums = 3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
+	sha512sums = a2d55514fd338b4b15a55725deebd82696572bfb0d63744a7f50d3aac0cf0a70908bdb0fb3a7ea776ced54c737eef38e7deaa58de93f89f320774459a08cc10c
+	sha512sums = ce6e5f3994118783fd1e05de7336782e4df4eaf3b2a277174ea536b0d391f418cb36682c1e1b3adee3b4d2aa07f25af58998525c79d0567f7afa88dda048c413
+	sha512sums = e90d108ac4531d68ba8bced44db71139cb7b4273f97ec994582150eb9d4f71960c525c1b3ad2fac95d678f91494b5299bfb00513a0a58cc5b6d916eb930af2d5
 	sha512sums = a5085d4e974a98cb6266502e06bd2b5a45e213f7d322e8f6cffccbaf92a7f414641b6e6578f87f76dbbb3e4f89b3c268dc33e813c13ea5512e52d1b241317f2a
 
 pkgname = extrae
diff --git a/PKGBUILD b/PKGBUILD
index 6aa2f41b1d63..374699580ccb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,28 @@
 # Maintainer: Joan Bruguera Micó <joanbrugueram@gmail.com>
 pkgname='extrae'
 pkgdesc='Instrumentation framework to generate execution traces of the most used parallel runtimes (from BSC).'
-pkgver='4.0.1.20220513'
-pkgrel='4'
+pkgver='4.0.2.20230303'
+pkgrel='1'
 arch=('i686' 'x86_64')
 url='https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools'
 license=('LGPL2.1')
 depends=(openmpi libunwind papi libxml2 zlib python)
 source=("https://github.com/bsc-performance-tools/$pkgname/archive/${pkgver%.*}.tar.gz"
         extrae-issue-27-fix-pie-address-translation.patch
+        extrae-Fix-make-DESTDIR-.-install-for-Extrae-4.0.2.patch
         extrae-Fix-references-to-the-build-directory.patch)
-sha512sums=(58cbe06b1eb738dba3c9d38a96ca8a9bf442c492214e086876af25b8d7e01c379b46281f6815763e87e0e69214636f95486d48b1b6ce088b54d24b4d77ff0920
-            3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
+sha512sums=(a2d55514fd338b4b15a55725deebd82696572bfb0d63744a7f50d3aac0cf0a70908bdb0fb3a7ea776ced54c737eef38e7deaa58de93f89f320774459a08cc10c
+            ce6e5f3994118783fd1e05de7336782e4df4eaf3b2a277174ea536b0d391f418cb36682c1e1b3adee3b4d2aa07f25af58998525c79d0567f7afa88dda048c413
+            e90d108ac4531d68ba8bced44db71139cb7b4273f97ec994582150eb9d4f71960c525c1b3ad2fac95d678f91494b5299bfb00513a0a58cc5b6d916eb930af2d5
             a5085d4e974a98cb6266502e06bd2b5a45e213f7d322e8f6cffccbaf92a7f414641b6e6578f87f76dbbb3e4f89b3c268dc33e813c13ea5512e52d1b241317f2a)
 
 prepare() {
 	cd "$srcdir/$pkgname-${pkgver%.*}"
 
-	# Replace PTR type (from ansidecl.h) which was recently removed from binutils
-	sed -i 's|PTR|void *|g' src/merger/common/bfd_manager.c
-
 	# Upstream issue: https://github.com/bsc-performance-tools/extrae/issues/27
 	patch -Np1 -i "$srcdir/extrae-issue-27-fix-pie-address-translation.patch"
+
+	patch -Np1 -i "$srcdir/extrae-Fix-make-DESTDIR-.-install-for-Extrae-4.0.2.patch"
 	patch -Np1 -i "$srcdir/extrae-Fix-references-to-the-build-directory.patch"
 
 	# The OpenMPI package also has a library called libompitrace, which conflicts with
@@ -34,10 +35,6 @@ prepare() {
 build() {
 	cd "$srcdir/$pkgname-${pkgver%.*}"
 
-	# OpenMPI library path changed between openmpi 4.1.2-1 and 4.1.3-1
-	# Autodetect which one it is to smoothen transition
-	[ -e /usr/lib/openmpi/libmpi.so ] && MPILIBPATH=/usr/lib/openmpi || MPILIBPATH=/usr/lib
-
 	# NOTE: The following optional features are NOT enabled:
 	# * Automatic instrumentation (with dyninst)
 	# * CUDA support
@@ -51,7 +48,7 @@ build() {
 	./configure \
 		--prefix=/usr \
 		--with-mpi=/usr \
-		--with-mpi-libs="$MPILIBPATH" \
+		--with-mpi-libs=/usr/lib \
 		--with-mpi-headers=/usr/include/openmpi \
 		--with-unwind=/usr \
 		--with-unwind-headers=/usr/include \
diff --git a/extrae-Fix-make-DESTDIR-.-install-for-Extrae-4.0.2.patch b/extrae-Fix-make-DESTDIR-.-install-for-Extrae-4.0.2.patch
new file mode 100644
index 000000000000..ce8c3cf53892
--- /dev/null
+++ b/extrae-Fix-make-DESTDIR-.-install-for-Extrae-4.0.2.patch
@@ -0,0 +1,35 @@
+From bb50dfa2770d20856467d9c2347f67da362608b9 Mon Sep 17 00:00:00 2001
+From: Joan Bruguera <joanbrugueram@gmail.com>
+Date: Sun, 5 Mar 2023 17:07:18 +0000
+Subject: [PATCH] Fix 'make DESTDIR=... install' for Extrae 4.0.2.
+
+---
+ src/extrae-uncore/Makefile.am | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/extrae-uncore/Makefile.am b/src/extrae-uncore/Makefile.am
+index 4d975770..59408f18 100644
+--- a/src/extrae-uncore/Makefile.am
++++ b/src/extrae-uncore/Makefile.am
+@@ -3,12 +3,12 @@ SUBDIRS = uncore-service
+ dist_bin_SCRIPTS = extrae-uncore.py
+ 
+ install-data-hook:
+-	$(top_srcdir)/substitute $(SED) "@sub_PREFIXDIR@" "${prefix}"    ${prefix}/bin/extrae-uncore.py
+-	$(top_srcdir)/substitute $(SED) "@sub_LIBDIR@"    "${libdir}"    ${prefix}/bin/extrae-uncore.py
+-	$(top_srcdir)/substitute $(SED) "@sub_PAPI_HOME@" "${PAPI_HOME}" ${prefix}/bin/extrae-uncore.py
+-	ln -fs ${prefix}/bin/extrae-uncore.py ${prefix}/bin/extrae-uncore
+-	chmod u+x ${prefix}/bin/extrae-uncore
++	$(top_srcdir)/substitute $(SED) "@sub_PREFIXDIR@" "${prefix}"    $(DESTDIR)${prefix}/bin/extrae-uncore.py
++	$(top_srcdir)/substitute $(SED) "@sub_LIBDIR@"    "${libdir}"    $(DESTDIR)${prefix}/bin/extrae-uncore.py
++	$(top_srcdir)/substitute $(SED) "@sub_PAPI_HOME@" "${PAPI_HOME}" $(DESTDIR)${prefix}/bin/extrae-uncore.py
++	ln -fs ${prefix}/bin/extrae-uncore.py $(DESTDIR)${prefix}/bin/extrae-uncore
++	chmod u+x $(DESTDIR)${prefix}/bin/extrae-uncore.py
+ 	$(MKDIR_P) $(DESTDIR)$(sysconfdir)
+ 	cp extrae_uncore_template.xml $(DESTDIR)$(sysconfdir)/extrae_uncore_template.xml
+-	$(top_srcdir)/substitute $(SED) "@sub_PREFIXDIR@" "${prefix}" ${prefix}/etc/extrae_uncore_template.xml
++	$(top_srcdir)/substitute $(SED) "@sub_PREFIXDIR@" "${prefix}" $(DESTDIR)${prefix}/etc/extrae_uncore_template.xml
+ 
+-- 
+2.39.2
+
diff --git a/extrae-issue-27-fix-pie-address-translation.patch b/extrae-issue-27-fix-pie-address-translation.patch
index 8ca3487266cb..0f29872236bd 100644
--- a/extrae-issue-27-fix-pie-address-translation.patch
+++ b/extrae-issue-27-fix-pie-address-translation.patch
@@ -1,13 +1,13 @@
 diff --git a/src/merger/paraver/addr2info.c b/src/merger/paraver/addr2info.c
-index e6d3697e..527af0cf 100644
+index 729df91..198d2a2 100644
 --- a/src/merger/paraver/addr2info.c
 +++ b/src/merger/paraver/addr2info.c
-@@ -810,7 +810,7 @@ static void Translate_Address (UINT64 address, unsigned ptask, unsigned task,
- 		if (!found)
- 		{
- 			found = BFDmanager_translateAddress (obj->bfdImage, obj->bfdSymbols,
--			  (void*) (address - obj->start_address), &translated_function,
-+			  (void*) (address - obj->start_address + obj->offset), &translated_function,
- 			  &translated_filename, &translated_line);
- 		}
+@@ -818,7 +818,7 @@ static void Translate_Address (UINT64 address, unsigned ptask, unsigned task,
+ 		 * offsets are applied when it belongs to the main binary.
+ 		 */
+ 		found = BFDmanager_translateAddress (obj->bfdImage, obj->bfdSymbols,
+-		 (void *)(obj->main_binary ? address : address - obj->start_address + obj->offset), 
++		 (void *)(address - obj->start_address + obj->offset), 
+ 		  &translated_function, &translated_filename, &translated_line);
  	}
+ 	else