From d654b041c207869eb6217e2d8b0552fd4d8d9988 Mon Sep 17 00:00:00 2001
From: Axel Huebl <axel.huebl@plasma.ninja>
Date: Mon, 1 Jul 2019 18:01:41 +0200
Subject: [PATCH] Clean-Up More

---
 recipes/adios2/build.sh  |  3 ---
 recipes/adios2/meta.yaml | 11 +++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/recipes/adios2/build.sh b/recipes/adios2/build.sh
index 5bdc4a516375e..5c43dbcc34523 100644
--- a/recipes/adios2/build.sh
+++ b/recipes/adios2/build.sh
@@ -10,9 +10,6 @@ if [[ ${target_platform} =~ osx.* ]]; then
     CMAKE_PLATFORM_FLAGS+=(-DADIOS2_USE_Fortran=OFF)
     CMAKE_PLATFORM_FLAGS+=(-DADIOS2_USE_BZip2=OFF)
 elif [[ ${target_platform} =~ linux.* ]]; then
-    # link transitive libraries during build of intermediate wrapper lib
-    # export LDFLAGS="${LDFLAGS} -Wl,-rpath-link,${PREFIX}/lib"
-
     CMAKE_PLATFORM_FLAGS+=(-DCMAKE_TOOLCHAIN_FILE="${RECIPE_DIR}/cross-linux.cmake")
 fi
 
diff --git a/recipes/adios2/meta.yaml b/recipes/adios2/meta.yaml
index e46554450b4f8..ff1d2ba96963c 100644
--- a/recipes/adios2/meta.yaml
+++ b/recipes/adios2/meta.yaml
@@ -41,7 +41,8 @@ build:
 
   run_exports:
     # strict runtime dependency on build-time MPI flavor
-    - {{ name }} * {{ mpi_prefix }}_* 
+    - {{ name }} * {{ mpi_prefix }}_*
+    - hdf5 * {{ mpi_prefix }}_*
     # https://conda.io/docs/user-guide/tasks/build-packages/variants.html#referencing-subpackages
     # in 0.X.*, newer minor versions are compatible
     - {{ pin_subpackage('adios2', min_pin='x.x', max_pin='x.x') }}
@@ -59,9 +60,8 @@ requirements:
     - mpi4py     # [mpi != 'nompi']
     - python
     - numpy >=1.15.0
-    # missing linker symbols on Windows
-    - hdf5  >=1.8.13                    # [mpi == 'nompi' and not win]
-    - hdf5  >=1.8.13 = mpi_{{ mpi }}_*  # [mpi != 'nompi' and not win]
+    # TODO: missing linker symbols on Windows
+    - hdf5  >=1.8.13 = {{ mpi_prefix }}_*  # [not win]
     # TODO: seams broken on OSX
     - zeromq >=4.1  # [not osx]
     - bzip2         # [not osx]
@@ -74,8 +74,7 @@ requirements:
 
 test:
   imports:
-    # TODO: MPI_Init will be fixed in 2.4.0+
-    - adios2  # [mpi == 'nompi']
+    - adios2
   commands:
     # - python -c "import adios2; print(adios2.__version__);"
     - test -f ${PREFIX}/lib/cmake/adios2/adios2-config.cmake                      # [unix]