Merge pull request easybuilders#3393 from julianmorillo/develop

Extrae: force --without-unwind for ARM and add --with-libz option for all architectures
akesandgren · Jul 18, 2024 · c4951c7 · c4951c7
2 parents 32e45bd + 1ea2cf3
commit c4951c7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/easybuild/easyblocks/e/extrae.py b/easybuild/easyblocks/e/extrae.py
@@ -51,16 +51,17 @@ def configure_step(self):
             deps = {
                 'binutils': ('', '--with-binutils=%s', ''),
                 'Boost': ('', '--with-boost=%s', ''),
-                'libunwind': ('', '--with-unwind=%s', ''),
+                'libunwind': ('', '--with-unwind=%s', '--without-unwind'),
                 'libxml2': ('--enable-merge-in-trace', '--with-xml=%s', ''),
                 'PAPI': ('--enable-sampling', '--with-papi=%s', '--without-papi'),
+                'zlib': ('', '--with-libz=%s', ''),
             }
         else:
             deps = {
                 'binutils': ('', '--with-binutils=%s', ''),
                 'Boost': ('', '--with-boost=%s', ''),
                 'libdwarf': ('', '--with-dwarf=%s', '--without-dwarf'),
-                'libunwind': ('', '--with-unwind=%s', ''),
+                'libunwind': ('', '--with-unwind=%s', '--without-unwind'),
                 'libxml2': (' --enable-xml --enable-merge-in-trace', '', ''),
                 'PAPI': ('--enable-sampling', '--with-papi=%s', '--without-papi'),
             }