From b267f4c7baa842fd6835a555ffe11402788464a9 Mon Sep 17 00:00:00 2001 From: John Marshall Date: Mon, 6 Apr 2020 16:26:00 +0100 Subject: [PATCH] nanopolish: fix macOS build: pass environment's $CXXFLAGS to make (#21330) Fast5 uses static_assert, which is from C++11 -- which is later than the default language standard on conda's macOS compiler. Explicitly pass $CXXFLAGS down, as it includes `-std=c++14` and so makes static_assert available. --- recipes/nanopolish/build.sh | 4 ++-- recipes/nanopolish/meta.yaml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/recipes/nanopolish/build.sh b/recipes/nanopolish/build.sh index a5a4ebf25b11e..17b7ddc796692 100755 --- a/recipes/nanopolish/build.sh +++ b/recipes/nanopolish/build.sh @@ -10,10 +10,10 @@ mkdir -p $PREFIX/bin # Linker options aren't passed to minimap2 pushd minimap2 -make CFLAGS="$CFLAGS" LIBS="-L$PREFIX/lib -lm -lz -pthread" libminimap2.a +make CFLAGS="$CFLAGS" CXXFLAGS="$CXXFLAGS" LIBS="-L$PREFIX/lib -lm -lz -pthread" libminimap2.a popd -make HDF5=noinstall EIGEN=noinstall HTS=noinstall MINIMAP=noinstall CXXFLAGS="-Iminimap2 -g -O3" LDFLAGS="$LDFLAGS -pthread -fopenmp" +make HDF5=noinstall EIGEN=noinstall HTS=noinstall MINIMAP=noinstall CXXFLAGS="$CXXFLAGS -Iminimap2 -g -O3" LDFLAGS="$LDFLAGS -pthread -fopenmp" cp nanopolish $PREFIX/bin cp scripts/nanopolish_makerange.py $PREFIX/bin cp scripts/nanopolish_merge.py $PREFIX/bin diff --git a/recipes/nanopolish/meta.yaml b/recipes/nanopolish/meta.yaml index 6503bbe0c7ef5..a298e65725dff 100644 --- a/recipes/nanopolish/meta.yaml +++ b/recipes/nanopolish/meta.yaml @@ -6,8 +6,7 @@ package: version: {{ version }} build: - number: 0 - skip: True # [osx] + number: 1 binary_relocation: False source: