summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoan Bruguera2019-07-05 17:44:02 +0200
committerJoan Bruguera2019-07-05 17:44:02 +0200
commitaa0b7253acc3f6b360ae3873c2e5b88febc7ea90 (patch)
tree226b86db18fc7bab24f339461a6e9e928aa084c5
parent37b690ed27adb88c133538ee82b3bdf4349a8897 (diff)
downloadaur-aa0b7253acc3f6b360ae3873c2e5b88febc7ea90.tar.gz
Upgrade to 3.7.1 + add patch for making it work with binaries compiled with Arch default compile settings (GitHub issue #27).
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD14
-rw-r--r--extrae-issue-27-fix-pie-address-translation.patch13
3 files changed, 29 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index be30efab5d60..e332dc9b65b6 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.7.0
+ pkgver = 3.7.1
pkgrel = 1
url = https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools
arch = i686
@@ -11,8 +11,10 @@ pkgbase = extrae
depends = papi
depends = libxml2
depends = zlib
- source = https://ftp.tools.bsc.es/extrae/extrae-3.7.0-src.tar.bz2
- sha512sums = 59e886c41f699f58932c22d17511fb1a9540f814689695b03e959896399a9a9d951d0c44adc3b41612b20bb071a0572f27f4cf2d23e11cbcf7f466225b5c353a
+ source = https://ftp.tools.bsc.es/extrae/extrae-3.7.1-src.tar.bz2
+ source = extrae-issue-27-fix-pie-address-translation.patch
+ sha512sums = 629816657bb80ecc55d0167967e4f5eb5ebcfc1482a595a842d7b82690613dbbeae566baf724d8c5d753fa52d3672e6570252937eae8a8a6f141d11eb08ed886
+ sha512sums = 3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba
pkgname = extrae
diff --git a/PKGBUILD b/PKGBUILD
index 3c42083f6f60..03889182142c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,22 @@
# 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.0'
+pkgver='3.7.1'
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)
-source=("https://ftp.tools.bsc.es/$pkgname/$pkgname-$pkgver-src.tar.bz2")
-sha512sums=(59e886c41f699f58932c22d17511fb1a9540f814689695b03e959896399a9a9d951d0c44adc3b41612b20bb071a0572f27f4cf2d23e11cbcf7f466225b5c353a)
+source=("https://ftp.tools.bsc.es/$pkgname/$pkgname-$pkgver-src.tar.bz2"
+ extrae-issue-27-fix-pie-address-translation.patch)
+sha512sums=(629816657bb80ecc55d0167967e4f5eb5ebcfc1482a595a842d7b82690613dbbeae566baf724d8c5d753fa52d3672e6570252937eae8a8a6f141d11eb08ed886
+ 3b0fae157fcc6e85be3a5565c2ea3abe8bf35e130de96435a93ba7b3f4b6c30df8982823d36c494633a2c16671664112558393faeead05226b96aa521bb14fba)
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -Np1 -i "$srcdir/extrae-issue-27-fix-pie-address-translation.patch"
+}
build() {
cd "$srcdir/$pkgname-$pkgver"
diff --git a/extrae-issue-27-fix-pie-address-translation.patch b/extrae-issue-27-fix-pie-address-translation.patch
new file mode 100644
index 000000000000..8ca3487266cb
--- /dev/null
+++ b/extrae-issue-27-fix-pie-address-translation.patch
@@ -0,0 +1,13 @@
+diff --git a/src/merger/paraver/addr2info.c b/src/merger/paraver/addr2info.c
+index e6d3697e..527af0cf 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);
+ }
+ }