pbbam: revdep rebuilds #2

bioconda · Aug 30, 2019 · 900b047 · 900b047
1 parent 312268e
commit 900b047
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/recipes/bax2bam/build.sh b/recipes/bax2bam/build.sh
@@ -4,8 +4,12 @@ export BOOST_ROOT="${PREFIX}"
 export PKG_CONFIG_LIBDIR="${PREFIX}"/lib/pkgconfig
 
 # HDF5 doesn't have pkgconfig files yet
-export CPPFLAGS="-isystem ${PREFIX}/include"
-export LDFLAGS="-L${PREFIX}/lib -lhdf5_cpp -lhdf5"
+export CPPFLAGS+=" -isystem ${PREFIX}/include"
+export LDFLAGS+=" -L${PREFIX}/lib -lhdf5_cpp -lhdf5"
+
+# required for Meson's sanity check
+export LD_LIBRARY_PATH="${PREFIX}/lib"
+export DYLD_FALLBACK_LIBRARY_PATH="${PREFIX}/lib"
 
 # configure
 # '--wrap-mode nofallback' prevents meson from downloading

diff --git a/recipes/bax2bam/meta.yaml b/recipes/bax2bam/meta.yaml
@@ -21,7 +21,7 @@ extra:
     - mhsieh
 
 build:
-  number: 6
+  number: 7
 
 requirements:
   build:
@@ -34,12 +34,12 @@ requirements:
     - hdf5
     - zlib
     - blasr_libcpp 5.3.3*
-    - pbbam 0.23.0*
+    - pbbam 1.0.6*
   run:
     - hdf5
     - zlib
     - blasr_libcpp 5.3.3*
-    - pbbam 0.23.0*
+    - pbbam 1.0.6*
 
 test:
   commands:

diff --git a/recipes/blasr/build.sh b/recipes/blasr/build.sh
@@ -4,8 +4,12 @@ export BOOST_ROOT="${PREFIX}"
 export PKG_CONFIG_LIBDIR="${PREFIX}"/lib/pkgconfig
 
 # HDF5 doesn't have pkgconfig files yet
-export CPPFLAGS="-isystem ${PREFIX}/include"
-export LDFLAGS="-L${PREFIX}/lib -lhdf5_cpp -lhdf5"
+export CPPFLAGS+=" -isystem ${PREFIX}/include"
+export LDFLAGS+=" -L${PREFIX}/lib -lhdf5_cpp -lhdf5"
+
+# required for Meson's sanity check
+export LD_LIBRARY_PATH="${PREFIX}/lib"
+export DYLD_FALLBACK_LIBRARY_PATH="${PREFIX}/lib"
 
 # configure
 # '--wrap-mode nofallback' prevents meson from downloading

diff --git a/recipes/blasr/meta.yaml b/recipes/blasr/meta.yaml
@@ -21,7 +21,7 @@ extra:
     - mhsieh
 
 build:
-  number: 0
+  number: 1
 
 requirements:
   build:
@@ -34,11 +34,11 @@ requirements:
     - zlib
     - hdf5
     - blasr_libcpp 5.3.3*
-    - pbbam 0.23.0*
+    - pbbam 1.0.6*
   run:
     - hdf5
     - blasr_libcpp 5.3.3*
-    - pbbam 0.23.0*
+    - pbbam 1.0.6*
 
 test:
   commands: