Update to 4.0.1.20220513

3 files changed, 5 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9d10dcb636c5..5bbfdeec911f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = extrae
 	pkgdesc = Instrumentation framework to generate execution traces of the most used parallel runtimes (from BSC).
-	pkgver = 4.0.0.20220325
+	pkgver = 4.0.1.20220513
 	pkgrel = 1
 	url = https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools
 	arch = i686
@@ -12,13 +12,11 @@ pkgbase = extrae
 	depends = libxml2
 	depends = zlib
 	depends = python
-	source = https://github.com/bsc-performance-tools/extrae/archive/4.0.0.tar.gz
+	source = https://github.com/bsc-performance-tools/extrae/archive/4.0.1.tar.gz
 	source = extrae-issue-27-fix-pie-address-translation.patch
-	source = extrae-Fix-syntax-error-on-generated-configure-script.patch
 	source = extrae-Fix-references-to-the-build-directory.patch
-	sha512sums = 6ccdfd87d91085674fc643ab5e8b23e733e36a925db35f73ced1016336b77f9750746adf769c4e005c2b5dfefbc316b8967001522d6d65f0c4a29039d546c324
+	sha512sums = 58cbe06b1eb738dba3c9d38a96ca8a9bf442c492214e086876af25b8d7e01c379b46281f6815763e87e0e69214636f95486d48b1b6ce088b54d24b4d77ff0920
 	sha512sums = 3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
-	sha512sums = e60bfe1a5b080e744e11e5ce3e5f1bff46e6a8c238ce3fe9b0c2bec9a57d635fd211ffb8489f949e153ad270c4d4b2aaa0f7b665407a9852fa5df3815a700bb7
 	sha512sums = a5085d4e974a98cb6266502e06bd2b5a45e213f7d322e8f6cffccbaf92a7f414641b6e6578f87f76dbbb3e4f89b3c268dc33e813c13ea5512e52d1b241317f2a
 
 pkgname = extrae
diff --git a/PKGBUILD b/PKGBUILD
index 08fe1cd4c83c..632f99fba1bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # 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.0.20220325'
+pkgver='4.0.1.20220513'
 pkgrel='1'
 arch=('i686' 'x86_64')
 url='https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools'
@@ -9,11 +9,9 @@ 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-syntax-error-on-generated-configure-script.patch
         extrae-Fix-references-to-the-build-directory.patch)
-sha512sums=(6ccdfd87d91085674fc643ab5e8b23e733e36a925db35f73ced1016336b77f9750746adf769c4e005c2b5dfefbc316b8967001522d6d65f0c4a29039d546c324
+sha512sums=(58cbe06b1eb738dba3c9d38a96ca8a9bf442c492214e086876af25b8d7e01c379b46281f6815763e87e0e69214636f95486d48b1b6ce088b54d24b4d77ff0920
             3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
-            e60bfe1a5b080e744e11e5ce3e5f1bff46e6a8c238ce3fe9b0c2bec9a57d635fd211ffb8489f949e153ad270c4d4b2aaa0f7b665407a9852fa5df3815a700bb7
             a5085d4e974a98cb6266502e06bd2b5a45e213f7d322e8f6cffccbaf92a7f414641b6e6578f87f76dbbb3e4f89b3c268dc33e813c13ea5512e52d1b241317f2a)
 
 prepare() {
@@ -21,7 +19,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-syntax-error-on-generated-configure-script.patch"
 	patch -Np1 -i "$srcdir/extrae-Fix-references-to-the-build-directory.patch"
 
 	autoreconf -i -f
diff --git a/extrae-Fix-syntax-error-on-generated-configure-script.patch b/extrae-Fix-syntax-error-on-generated-configure-script.patch
deleted file mode 100644
index 0ccf605bf331..000000000000
--- a/extrae-Fix-syntax-error-on-generated-configure-script.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6501a197ae0f3d84c7732e1e6a948d973491972c Mon Sep 17 00:00:00 2001
-From: Joan Bruguera <joanbrugueram@gmail.com>
-Date: Fri, 25 Mar 2022 20:00:36 +0100
-Subject: [PATCH] Fix syntax error on generated configure script
-
-Regression introduced in f8e1ccdb5b54604a8827480e767b41c9f164ef8c
-
-It appears that (at least on my system) when `AX_FIND_INSTALLATION` is called
-with an empty array on `$6=list-of-optional-headers`, an empty if body is
-generated and the configure script fails with:
-
-    ./configure: line 11487: syntax error near unexpected token `fi'
-
-Let's put something in the if body to work around it
----
- config/macros.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/config/macros.m4 b/config/macros.m4
-index d009f859..9afc11c8 100644
---- a/config/macros.m4
-+++ b/config/macros.m4
-@@ -212,6 +212,7 @@ dnl AX_FLAGS_SAVE()
-     dnl Test for optional headers
-     if test -n "$6"; then
-       AC_CHECK_HEADERS($6)
-+      true
-     fi
-   fi
- 
--- 
-2.35.1
-