From a477e63c9e6852c937692372c46bd7ba72dd04a3 Mon Sep 17 00:00:00 2001
From: Caubet Serrabou Marc <caubet_m@cn080.merlin7.psi.ch>
Date: Thu, 5 Sep 2024 16:39:28 +0200
Subject: [PATCH] Update openmpi and libevent

---
 Compiler/openmpi/build               |  8 ++++++++
 Libraries/libevent/build             |  5 -----
 Libraries/libevent/files/config.yaml | 30 ++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 Libraries/libevent/files/config.yaml

diff --git a/Compiler/openmpi/build b/Compiler/openmpi/build
index e96f066..ea15ce5 100755
--- a/Compiler/openmpi/build
+++ b/Compiler/openmpi/build
@@ -1,6 +1,7 @@
 #!/usr/bin/env modbuild
 
 pbuild::pre_configure() {
+<<<<<<< HEAD
         if (( V_MAJOR < 5 )); then
 		pbuild::add_configure_args "--enable-mpi-cxx"
 		pbuild::add_configure_args "--enable-mpi-cxx-seek"
@@ -20,6 +21,13 @@ pbuild::pre_configure() {
 		pbuild::add_configure_args "--enable-mpi-fortran"
 		pbuild::add_configure_args "--without-verbs"
 	fi
+=======
+	pbuild::add_configure_args "--prefix=${PREFIX}"
+
+	pbuild::add_configure_args "--enable-shared"
+	pbuild::add_configure_args "--enable-orterun-prefix-by-default"
+	pbuild::add_configure_args "--with-slurm=yes"
+>>>>>>> a5c5629 (Update openmpi and libevent)
 
 	if [[ -v CUDA_VERSION ]]; then	
 		pbuild::add_configure_args "--with-cuda=${CUDA_HOME}"
diff --git a/Libraries/libevent/build b/Libraries/libevent/build
index 1239be0..6e021f3 100755
--- a/Libraries/libevent/build
+++ b/Libraries/libevent/build
@@ -1,7 +1,2 @@
 #!/usr/bin/env modbuild
 
-pbuild::set_download_url "https://github.com/libevent/libevent/releases/download/release-$V-stable/$P-$V-stable.tar.gz"
-pbuild::add_to_group 'Libraries'
-
-pbuild::install_docfiles 'LICENSE'
-
diff --git a/Libraries/libevent/files/config.yaml b/Libraries/libevent/files/config.yaml
new file mode 100644
index 0000000..23af643
--- /dev/null
+++ b/Libraries/libevent/files/config.yaml
@@ -0,0 +1,30 @@
+format: 1
+libevent:
+  defaults:
+    group: Libraries
+    relstage: stable
+    configure_args:
+      - --enable-shared
+      - --enable-static
+    docfiles:
+      - LICENSE
+    urls:
+      - url: https://github.com/libevent/libevent/releases/download/release-$V-stable/$P-$V-stable.tar.gz
+  shasums:
+    libevent-2.1.8-stable.tar.gz: 965cc5a8bb46ce4199a47e9b2c9e1cae3b137e8356ffdad6d94d3b9069b71dc2
+    libevent-2.1.12-stable.tar.gz: 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
+  versions:
+    2.1.12:
+      config:
+        runtime_deps: []
+      variants:
+        - systems: [.*.merlin7.psi.ch]
+          overlay: Alps
+          use_overlays: [PSI]
+          build_requires: []
+          relstage: unstable
+        - systems: [rhel.*]
+          build_requires: [openssl/1.1.1k]
+    2.1.8:
+      config:
+        build_requires: [openssl/1.0.2r]