Upgrade to Extrae 3.8.0.

4 files changed, 10 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1b9076227601..39e5afe26d00 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 = 3.7.1.20200129
-	pkgrel = 3
+	pkgver = 3.8.0.20200623
+	pkgrel = 1
 	url = https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools
 	arch = i686
 	arch = x86_64
@@ -12,14 +12,12 @@ pkgbase = extrae
 	depends = libxml2
 	depends = zlib
 	depends = python
-	source = https://ftp.tools.bsc.es/extrae/extrae-3.7.1-src.tar.bz2
+	source = https://ftp.tools.bsc.es/extrae/extrae-3.8.0-src.tar.bz2
 	source = extrae-issue-27-fix-pie-address-translation.patch
 	source = extrae-Fix-references-to-the-build-directory.patch
-	source = extrae-Fix-up-bfd_get_section_-macros-due-to-binutils-2.34.patch
-	sha512sums = b1a72a0a813de179946b83cea0a64c918654e6a6a2211e097b306dda13d69b4a8707d0390c225418fe4e92750cc7822a258c247e2472aab2415deecb50a4f53c
+	sha512sums = d38f6833fe82df16fa5320c89b0951c023bb8d0ce9e86a2d79d570984d777b66bb47073791c816e103c7ad59102572ea847a65366ae0edca0d08c56fdd85860a
 	sha512sums = 3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
-	sha512sums = 1f4e5ab8b375cd456c3f4d0356e33f99d3fd49152b3147a0fdc5317368b1df11bdbda809720c38959c698e885615e961d37a87d3ad6b6b85a3a2caf0c1117db1
-	sha512sums = 0f622819dd204fb77f9dc6f5ca612b44296b783c347d37e845d09b5c447214e2537fa6608367dba4c8e928c81e640b88daf019ea15c7ca83bb9308899e997b8c
+	sha512sums = a5085d4e974a98cb6266502e06bd2b5a45e213f7d322e8f6cffccbaf92a7f414641b6e6578f87f76dbbb3e4f89b3c268dc33e813c13ea5512e52d1b241317f2a
 
 pkgname = extrae
 
diff --git a/PKGBUILD b/PKGBUILD
index 326cdd1522a7..fd28117e8b45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
 # 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='3.7.1.20200129'
-pkgrel='3'
+pkgver='3.8.0.20200623'
+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://ftp.tools.bsc.es/$pkgname/$pkgname-${pkgver%.*}-src.tar.bz2"
         extrae-issue-27-fix-pie-address-translation.patch
-        extrae-Fix-references-to-the-build-directory.patch
-        extrae-Fix-up-bfd_get_section_-macros-due-to-binutils-2.34.patch)
-sha512sums=(b1a72a0a813de179946b83cea0a64c918654e6a6a2211e097b306dda13d69b4a8707d0390c225418fe4e92750cc7822a258c247e2472aab2415deecb50a4f53c
+        extrae-Fix-references-to-the-build-directory.patch)
+sha512sums=(d38f6833fe82df16fa5320c89b0951c023bb8d0ce9e86a2d79d570984d777b66bb47073791c816e103c7ad59102572ea847a65366ae0edca0d08c56fdd85860a
             3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
-            1f4e5ab8b375cd456c3f4d0356e33f99d3fd49152b3147a0fdc5317368b1df11bdbda809720c38959c698e885615e961d37a87d3ad6b6b85a3a2caf0c1117db1
-            0f622819dd204fb77f9dc6f5ca612b44296b783c347d37e845d09b5c447214e2537fa6608367dba4c8e928c81e640b88daf019ea15c7ca83bb9308899e997b8c)
+            a5085d4e974a98cb6266502e06bd2b5a45e213f7d322e8f6cffccbaf92a7f414641b6e6578f87f76dbbb3e4f89b3c268dc33e813c13ea5512e52d1b241317f2a)
 
 prepare() {
 	cd "$srcdir/$pkgname-${pkgver%.*}"
@@ -22,7 +20,6 @@ prepare() {
 	# 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-references-to-the-build-directory.patch"
-	patch -Np1 -i "$srcdir/extrae-Fix-up-bfd_get_section_-macros-due-to-binutils-2.34.patch"
 
 	autoreconf -i -f
 }
diff --git a/extrae-Fix-references-to-the-build-directory.patch b/extrae-Fix-references-to-the-build-directory.patch
index a49882746d47..e0288058c83b 100644
--- a/extrae-Fix-references-to-the-build-directory.patch
+++ b/extrae-Fix-references-to-the-build-directory.patch
@@ -10,19 +10,6 @@ Subject: [PATCH] Fix references to the build directory that remain in the
  tests/overhead/Makefile.am | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/others/Makefile.am b/src/others/Makefile.am
-index cb2a75b..c52d434 100644
---- a/src/others/Makefile.am
-+++ b/src/others/Makefile.am
-@@ -40,7 +40,7 @@ endif
- 
- install-data-hook:
- 	cp pyextrae/common/extrae.py.in pyextrae/common/extrae.py
--	$(top_srcdir)/substitute $(SED) "@sub_PREFIX@" $(DESTDIR)${prefix} pyextrae/common/extrae.py
-+	$(top_srcdir)/substitute $(SED) "@sub_PREFIX@" ${prefix} pyextrae/common/extrae.py
- #if HAVE_PAPI
- 	$(top_srcdir)/substitute $(SED) "@sub_Extrae_eventandcounters@" Extrae_eventandcounters pyextrae/common/extrae.py
- 	$(top_srcdir)/substitute $(SED) "@sub_Extrae_neventandcounters@" Extrae_neventandcounters pyextrae/common/extrae.py
 diff --git a/tests/overhead/Makefile.am b/tests/overhead/Makefile.am
 index 67b3c92..093c177 100644
 --- a/tests/overhead/Makefile.am
diff --git a/extrae-Fix-up-bfd_get_section_-macros-due-to-binutils-2.34.patch b/extrae-Fix-up-bfd_get_section_-macros-due-to-binutils-2.34.patch
deleted file mode 100644
index 65357b12ad2a..000000000000
--- a/extrae-Fix-up-bfd_get_section_-macros-due-to-binutils-2.34.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 2564787ea16dbcfc1ebcccbebe17a2e85d433574 Mon Sep 17 00:00:00 2001
-From: Joan Bruguera <joanbrugueram@gmail.com>
-Date: Tue, 3 Mar 2020 22:20:30 +0100
-Subject: [PATCH] Fix up bfd_get_section_* macros due to binutils 2.34 update.
- See
- https://wiki.gentoo.org/wiki/Binutils_2.34_porting_notes/undefined_reference_to_bfd_get_section_*
- for more details.
-
----
- src/merger/common/bfd_manager.c | 16 +++-------------
- 1 file changed, 3 insertions(+), 13 deletions(-)
-
-diff --git a/src/merger/common/bfd_manager.c b/src/merger/common/bfd_manager.c
-index 86777b7..79d49d0 100644
---- a/src/merger/common/bfd_manager.c
-+++ b/src/merger/common/bfd_manager.c
-@@ -233,34 +233,24 @@ asymbol **BFDmanager_getDefaultSymbols (void)
-  */
- static void BFDmanager_findAddressInSection (bfd * abfd, asection * section, PTR data)
- {
--#if HAVE_BFD_GET_SECTION_SIZE || HAVE_BFD_GET_SECTION_SIZE_BEFORE_RELOC
- 	bfd_size_type size;
--#endif
- 	bfd_vma vma;
- 	BFDmanager_symbolInfo_t *symdata = (BFDmanager_symbolInfo_t*) data;
- 
- 	if (symdata->found)
- 		return;
- 
--	if ((bfd_get_section_flags (abfd, section) & SEC_ALLOC) == 0)
-+	if ((bfd_section_flags (section) & SEC_ALLOC) == 0)
- 		return;
- 
--	vma = bfd_get_section_vma (abfd, section);;
-+	vma = bfd_section_vma (section);;
- 
- 	if (symdata->pc < vma)
- 		return;
- 
--#if HAVE_BFD_GET_SECTION_SIZE
--	size = bfd_get_section_size (section);
--	if (symdata->pc >= vma + size)
--		return;
--#elif HAVE_BFD_GET_SECTION_SIZE_BEFORE_RELOC
--	size = bfd_get_section_size_before_reloc (section);
-+	size = bfd_section_size (section);
- 	if (symdata->pc >= vma + size)
- 		return;
--#else
--	/* Do nothing? */
--#endif
- 
- 	symdata->found = bfd_find_nearest_line (abfd, section, symdata->symbols,
- 	  symdata->pc - vma, &symdata->filename, &symdata->function,
--- 
-2.25.1
-