Rename libompitrace to libextraeompitrace since it causes a conflict with openmpi's libompitrace after Arch's openmpi 4.1.3-1 package

2 files changed, 6 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bbfdeec911f..c82037a84b8f 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 = 1
+	pkgrel = 2
 	url = https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools
 	arch = i686
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 632f99fba1bc..938ec18555cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 pkgname='extrae'
 pkgdesc='Instrumentation framework to generate execution traces of the most used parallel runtimes (from BSC).'
 pkgver='4.0.1.20220513'
-pkgrel='1'
+pkgrel='2'
 arch=('i686' 'x86_64')
 url='https://www.bsc.es/discover-bsc/organisation/scientific-structure/performance-tools'
 license=('LGPL2.1')
@@ -21,6 +21,10 @@ prepare() {
 	patch -Np1 -i "$srcdir/extrae-issue-27-fix-pie-address-translation.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
+	# extrae's version - rename extrae's version to libextraeompitrace to avoid the clash
+	sed -ie 's/libompitrace/libextraeompitrace/g' example/LINUX/MPI+OMP/ld-preload/trace.sh scripts/mpitrace_wizard src/tracer/Makefile.am
+
 	autoreconf -i -f
 }