summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoan Bruguera2022-03-25 20:11:05 +0100
committerJoan Bruguera2022-03-25 20:11:05 +0100
commitb831135734e527d7780c390f886dceeb14ed24f5 (patch)
tree99fcae0107648cd924bef0abc909e140f9b5169d
parentae7bb8d88a514fa20f228d69afb9c79f8cdd0615 (diff)
downloadaur-b831135734e527d7780c390f886dceeb14ed24f5.tar.gz
Update to 4.0.0.20220325
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD7
-rw-r--r--extrae-Fix-syntax-error-on-generated-configure-script.patch33
3 files changed, 43 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9a37acc3428b..9d10dcb636c5 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 = 3.8.3.20201111
+ pkgver = 4.0.0.20220325
pkgrel = 1
url = https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools
arch = i686
@@ -12,12 +12,13 @@ pkgbase = extrae
depends = libxml2
depends = zlib
depends = python
- source = https://github.com/bsc-performance-tools/extrae/archive/3.8.3.tar.gz
+ source = https://github.com/bsc-performance-tools/extrae/archive/4.0.0.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 = 3fba66447790e0a1c71c0e5a61f67ad966cdd4e19742799ecc50124a916ef599fff747027ccc803584f0ab2d1d76c29ded7072a70dd0aed5a3be7ff6ecbb8709
+ sha512sums = 6ccdfd87d91085674fc643ab5e8b23e733e36a925db35f73ced1016336b77f9750746adf769c4e005c2b5dfefbc316b8967001522d6d65f0c4a29039d546c324
sha512sums = 3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
+ sha512sums = e60bfe1a5b080e744e11e5ce3e5f1bff46e6a8c238ce3fe9b0c2bec9a57d635fd211ffb8489f949e153ad270c4d4b2aaa0f7b665407a9852fa5df3815a700bb7
sha512sums = a5085d4e974a98cb6266502e06bd2b5a45e213f7d322e8f6cffccbaf92a7f414641b6e6578f87f76dbbb3e4f89b3c268dc33e813c13ea5512e52d1b241317f2a
pkgname = extrae
-
diff --git a/PKGBUILD b/PKGBUILD
index 43f87e1fbf89..08fe1cd4c83c 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='3.8.3.20201111'
+pkgver='4.0.0.20220325'
pkgrel='1'
arch=('i686' 'x86_64')
url='https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools'
@@ -9,9 +9,11 @@ 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=(3fba66447790e0a1c71c0e5a61f67ad966cdd4e19742799ecc50124a916ef599fff747027ccc803584f0ab2d1d76c29ded7072a70dd0aed5a3be7ff6ecbb8709
+sha512sums=(6ccdfd87d91085674fc643ab5e8b23e733e36a925db35f73ced1016336b77f9750746adf769c4e005c2b5dfefbc316b8967001522d6d65f0c4a29039d546c324
3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
+ e60bfe1a5b080e744e11e5ce3e5f1bff46e6a8c238ce3fe9b0c2bec9a57d635fd211ffb8489f949e153ad270c4d4b2aaa0f7b665407a9852fa5df3815a700bb7
a5085d4e974a98cb6266502e06bd2b5a45e213f7d322e8f6cffccbaf92a7f414641b6e6578f87f76dbbb3e4f89b3c268dc33e813c13ea5512e52d1b241317f2a)
prepare() {
@@ -19,6 +21,7 @@ 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
new file mode 100644
index 000000000000..0ccf605bf331
--- /dev/null
+++ b/extrae-Fix-syntax-error-on-generated-configure-script.patch
@@ -0,0 +1,33 @@
+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
+