From dc6c03bf99216774301beb4d5bfe262034ed025b Mon Sep 17 00:00:00 2001 From: Alexander Peltzer Date: Thu, 30 May 2019 00:09:17 +0200 Subject: [PATCH] Unicycler 0.4.7 - b1 - fixes (#15605) * Bump with font config for fastqc recipe * Bump miniasm once for GCC7 * Try removing the change in 0.4.6 as it introduced weird errors * Bump miniasm once for GCC7 * Try removing the change in 0.4.6 as it introduced weird errors * Remove trim_galore changes from branch * Remove miniasm changes from branch * Remove Seqan patching with 2.4.0 * Clean build.sh No more replacing Seqan with 2.4.0 --- recipes/unicycler/build.sh | 4 ---- recipes/unicycler/meta.yaml | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/recipes/unicycler/build.sh b/recipes/unicycler/build.sh index ea1c22f8a9686..7d484546812d1 100644 --- a/recipes/unicycler/build.sh +++ b/recipes/unicycler/build.sh @@ -9,8 +9,4 @@ export CPATH="${PREFIX}/include" # Override Makefile -mtune=native export CXXFLAGS="-mtune=generic" -# TODO: remove when seqan is updated upstream -rm -rf unicycler/include/seqan -mv seqan/include/seqan unicycler/include/seqan - python -m pip install --no-deps --ignore-installed . diff --git a/recipes/unicycler/meta.yaml b/recipes/unicycler/meta.yaml index 35b18a5fd160b..49b9daed69bf4 100644 --- a/recipes/unicycler/meta.yaml +++ b/recipes/unicycler/meta.yaml @@ -11,12 +11,9 @@ source: patches: - Makefile.patch #[linux] - misc.py.patch - - url: https://github.com/seqan/seqan/archive/seqan-v2.4.0.tar.gz - sha256: 'd7084d17729214003e84818e0280a16f223c8f1c6a30eeef040c27e0c0047bd7' - folder: 'seqan' build: - number: 0 + number: 1 requirements: build: