Merge branch 'master' of xgitlab.cels.anl.gov:sds/sds-repo

eaba98c0 · Matthieu Dorier · 341da9f5 · 3efc6433 · eaba98c0
Commit eaba98c0 authored Nov 02, 2018 by Matthieu Dorier
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

packages/mercury/package.py packages/mercury/package.py +5 -2

No files found.
--- a/packages/mercury/package.py
+++ b/packages/mercury/package.py
@@ -44,8 +44,11 @@ class Mercury(CMakePackage):

    # if nothing specified, build good ol' BMI
    depends_on('cci@master', when="+cci", type=("build", "link", "run"))
-    depends_on('libfabric', when="+fabric", type=("build", "link", "run"))
-    depends_on('libfabric@develop', when="+fabric platform=cray", type=("build", "link", "run"))
+    # depends_on('libfabric', when="+fabric", type=("build", "link", "run"))
+    # depends_on('libfabric@develop', when="+fabric platform=cray", type=("build", "link", "run"))
+    # as of Nov 2, 2018, use git master for libfabric on all platforms; we 
+    #   need to test unreleased features on both gni and verbs at least
+    depends_on('libfabric@develop', when="+fabric", type=("build", "link", "run"))
    depends_on('bmi', when="+bmi", type=("build", "link", "run"))
    depends_on('openpa', type=("build", "link", "run"))