Added bufr-query as a variant (bufrquery) of jedi-base-env.

.gitmodules

@@ -1,9 +1,7 @@
 [submodule "spack"]
   path = spack
-  #url = https://github.com/jcsda/spack
-  #branch = spack-stack-dev
-  url = https://github.com/srherbener/spack
-  branch = feature/intro-bufr-query
+  url = https://github.com/jcsda/spack
+  branch = spack-stack-dev
 [submodule "doc/CMakeModules"]
   path = doc/CMakeModules
   url = https://github.com/noaa-emc/cmakemodules

configs/templates/unified-dev/spack.yaml

@@ -37,9 +37,6 @@ spack:
     # MADIS for WCOSS2 decoders.
     - [email protected]
 
-    # bufr_query for BUFR readers
-    #- [email protected]
-
   specs:
   - matrix:
     - [$packages]

spack-ext/repos/spack-stack/packages/jedi-base-env/package.py

@@ -20,12 +20,14 @@ class JediBaseEnv(BundlePackage):
     # Need to find a free fftw provider for fftw-api ...
     variant("fftw", default=True, description="Build fftw")
     variant("hdf4", default=True, description="Build hdf4 library and python hdf module")
+    variant("bufrquery", default=True, description="Build bufr-query library")
 
     depends_on("base-env", type="run")
     depends_on("bison", type="run")
     depends_on("blas", type="run")
     depends_on("boost", type="run")
     depends_on("bufr", type="run")
+    depends_on("bufr-query", when="+bufrquery", type="run")
     # Force users to load manually
     # depends_on("[email protected]", type="run")
     depends_on("ecbuild", type="run")