Merge branch 'master' into '285-gcc-fix-build-block-for-gracehopper'
# Conflicts: # Compiler/openmpi/files/config.yaml
This commit is contained in:
@@ -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'
|
||||
|
||||
|
||||
@@ -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]
|
||||
+14
-32
@@ -1,38 +1,20 @@
|
||||
#!/usr/bin/env modbuild
|
||||
|
||||
echo "https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
|
||||
pbuild::set_download_url "https://github.com/openpmix/openpmix/releases/download/v${V_PKG}/$P-${V_PKG}.tar.gz"
|
||||
|
||||
pbuild::add_to_group 'Libraries'
|
||||
|
||||
(( version = (${V_MAJOR} * 100 + ${V_MINOR}) * 100 + V_PATCHLVL ))
|
||||
if (( V_MAJOR > 1 )); then
|
||||
pbuild::install_docfiles AUTHORS README.md LICENSE NEWS VERSION
|
||||
else
|
||||
pbuild::install_docfiles README LICENSE NEWS VERSION
|
||||
fi
|
||||
|
||||
pbuild::compile_in_sourcetree
|
||||
|
||||
pbuild::pre_configure() {
|
||||
if [[ -n "${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 [[ -n "${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 [[ -n "${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
|
||||
}
|
||||
|
||||
@@ -1,24 +0,0 @@
|
||||
#!/usr/bin/env modbuild
|
||||
|
||||
pbuild::pre_configure() {
|
||||
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 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"
|
||||
}
|
||||
@@ -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,14 +14,18 @@ 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
|
||||
pmix-2.2.5.tar.gz: db24480fa5be080e1ddcb273098992b69f8f21e4cd6b8df1682e836b303a2a6f
|
||||
pmix-3.2.3.tar.gz: 1325a1355d0794196bb47665053fdbc588f9183aa5385f3581b668427316306e
|
||||
pmix-3.2.5.tar.gz: 61385a65b172bfbe8d5363c3cd8f7742cd81049ebb3d8acc0d25806935641584
|
||||
pmix-4.1.2.tar.gz: a7a6d5b322c261999ce0a6395c0ac7dc359c0ff61380ed4c6935430fb9f5f6e6
|
||||
pmix-4.2.3.tar.gz: fd45e18e483e42089d4059df9753d9be3cfb68297a05981b1d937e09f7716d5a
|
||||
pmix-4.2.4.tar.gz: f1fe5fe817ac447ce8d3d88486a1c0d22227efd186e11062aa1f7b0f093089c6
|
||||
pmix-4.2.9.tar.gz: 00ddb36fb81c31519972079a218c3cdd903510fc3910abaf4d484068fa29e884
|
||||
pmix-5.0.3.tar.gz: d9b0b81ba45f58f44573796eb05858061ed7f47ea6b29af8058090023e35dfa9
|
||||
versions:
|
||||
1.2.5:
|
||||
config:
|
||||
@@ -31,14 +38,30 @@ pmix:
|
||||
2.2.5;3.2.3:
|
||||
config:
|
||||
relstage: unstable
|
||||
4.1.2:
|
||||
runtime_deps: [libevent/2.1.12]
|
||||
build_requires: [gcc/12.3.0, hwloc/2.11.1]
|
||||
variants:
|
||||
- systems: [.*.merlin7.psi.ch]
|
||||
overlay: Alps
|
||||
use_overlays: [PSI]
|
||||
- systems: [rhel.*]
|
||||
3.2.5:
|
||||
config:
|
||||
relstage: unstable
|
||||
runtime_deps: [libevent/2.1.12]
|
||||
build_requires: [gcc/12.3.0, hwloc/2.11.1]
|
||||
variants:
|
||||
- systems: [.*.merlin7.psi.ch]
|
||||
overlay: Alps
|
||||
use_overlays: [PSI]
|
||||
4.1.2:
|
||||
config:
|
||||
relstage: stable
|
||||
runtime_deps: [libevent/2.1.12]
|
||||
build_requires: [hwloc/2.7.1]
|
||||
4.2.3:
|
||||
config:
|
||||
relstage: unstable
|
||||
relstage: stable
|
||||
runtime_deps: [libevent/2.1.12]
|
||||
build_requires: [hwloc/2.9.1]
|
||||
4.2.4:
|
||||
@@ -46,3 +69,29 @@ pmix:
|
||||
relstage: stable
|
||||
runtime_deps: [libevent/2.1.12]
|
||||
build_requires: [gcc/10.4.0, hwloc/2.9.1]
|
||||
4.2.9:
|
||||
config:
|
||||
relstage: unstable
|
||||
runtime_deps: [libevent/2.1.12]
|
||||
build_requires: [gcc/12.3.0, hwloc/2.11.1]
|
||||
variants:
|
||||
- systems: [.*.merlin7.psi.ch]
|
||||
overlay: Alps
|
||||
use_overlays: [PSI]
|
||||
5.0.3:
|
||||
config:
|
||||
relstage: unstable
|
||||
runtime_deps: [libevent/2.1.12]
|
||||
build_requires: [gcc/12.3.0, hwloc/2.11.1]
|
||||
variants:
|
||||
- systems: [.*.merlin7.psi.ch]
|
||||
overlay: Alps
|
||||
use_overlays: [PSI]
|
||||
configure_args+:
|
||||
- --with-lustre
|
||||
# - --with-cxi
|
||||
# - --with-slingshot
|
||||
# - --with-zlib
|
||||
# - --with-jansson
|
||||
# - --with-curl
|
||||
- systems: [rhel.*]
|
||||
|
||||
Reference in New Issue
Block a user