openmpi/pmix: build script and config updated for Alps

Libraries/pmix/build

@@ -1,24 +1,20 @@
 #!/usr/bin/env modbuild
 
 pbuild::pre_configure() {
-  if [[ -v HWLOC_PREFIX ]]; then
-    pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
-  fi
+	if [[ -v HWLOC_PREFIX ]]; then
+		pbuild::add_configure_args "--with-hwloc=${HWLOC_PREFIX}"
+	fi
 
-  if [[ -v LIBEVENT_PREFIX ]]; then
-    pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
-  fi
+	if [[ -v LIBEVENT_PREFIX ]]; then
+		pbuild::add_configure_args "--with-libevent=${LIBEVENT_PREFIX}"
+	fi
 
-  if [[ -v INTEL_VERSION ]]; then
-          pbuild::add_configure_args "CC=icc"
-          pbuild::add_configure_args "CXX=icpc"
-          pbuild::add_configure_args "FC=ifort"
-          pbuild::add_configure_args "F77=ifort"
-          pbuild::add_configure_args "F90=ifort"
-          # pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
-  fi
-
-  # pbuild::add_configure_args "--enable-pmi-backward-compatibility"
-  pbuild::add_configure_args "--enable-shared"
-  pbuild::add_configure_args "--enable-static"
+	if [[ -v INTEL_VERSION ]]; then
+		pbuild::add_configure_args "CC=icc"
+		build::add_configure_args "CXX=icpc"
+		pbuild::add_configure_args "FC=ifort"
+		pbuild::add_configure_args "F77=ifort"
+		pbuild::add_configure_args "F90=ifort"
+		# pbuild::add_configure_args "LDFLAGS=-Wc,-static-intel"
+	fi
 }

Libraries/pmix/files/config.yaml

@@ -3,7 +3,10 @@ pmix:
   defaults:
     group: Libraries
     relstage: stable
-    compile_in_sourcetree: yes
+    compile_in_sourcetree: true
+    configure_args:
+      - --enable-shared
+      - --enable-static
     docfiles:
       - AUTHORS
       - README.md
@@ -11,7 +14,7 @@ pmix:
       - NEWS
       - VERSION
     urls:
-      - url: "https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
+      - url: https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz
   shasums:
     pmix-1.2.5.tar.gz: d7337601c5b985743e6b6f79ec1a34dfc2aefbb2d04d40b2c0d5bd7100d268ed
     pmix-2.2.5.tar.gz: db24480fa5be080e1ddcb273098992b69f8f21e4cd6b8df1682e836b303a2a6f
@@ -19,7 +22,7 @@ pmix:
     pmix-4.1.2.tar.gz: a7a6d5b322c261999ce0a6395c0ac7dc359c0ff61380ed4c6935430fb9f5f6e6
     pmix-4.2.3.tar.gz: fd45e18e483e42089d4059df9753d9be3cfb68297a05981b1d937e09f7716d5a
     pmix-4.2.4.tar.gz: f1fe5fe817ac447ce8d3d88486a1c0d22227efd186e11062aa1f7b0f093089c6
-    pmix-5.0.3.tar.gz: c98afa8ec5a2495b82fae5eff731c4fc6371e0b0
+    pmix-5.0.3.tar.gz: d9b0b81ba45f58f44573796eb05858061ed7f47ea6b29af8058090023e35dfa9
   versions:
     1.2.5:
       config:
@@ -49,6 +52,11 @@ pmix:
         build_requires: [gcc/10.4.0, hwloc/2.9.1]
     5.0.3:
       config:
-        relstate: unstable
+        relstage: unstable
         runtime_deps: [libevent/2.1.12]
-        build_requires: [hwloc/2.11.1]
+        build_requires: [gcc/12.3.0, hwloc/2.11.1]
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          overlay: Alps
+          use_overlays: [PSI]
+        - systems: [rhel.*]