Skip to content

Commit

Permalink
Update: octopus, fix gcc 7.2; bcbio, ensemble support (bioconda#9915)
Browse files Browse the repository at this point in the history
- octopus: Re-enable builds using gcc 7.2, removing from blacklist.
  Thanks to tips from bioconda#9904. Still uses custom boost build until
  conda-forge boost available with 7.2 support.
- bcbio: latest development version with CWL ensemble support
  • Loading branch information
chapmanb committed Jul 15, 2018
1 parent f44e413 commit 39ce76c
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
2 changes: 0 additions & 2 deletions build-fail-blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -1879,8 +1879,6 @@ recipes/libbigwig
recipes/prophyle/0.2.1

# no clue
recipes/octopus

recipes/portcullis/1.1.1
recipes/portcullis/1.1.0

Expand Down
6 changes: 3 additions & 3 deletions recipes/bcbio-nextgen/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ package:
version: '1.1.1a'

build:
number: 0
number: 1
skip: true # [not py27]

source:
#url: https://pypi.io/packages/source/b/bcbio-nextgen/bcbio-nextgen-1.1.0.tar.gz
url: https://github.com/bcbio/bcbio-nextgen/archive/cfd2a50.tar.gz
sha256: 3feeee8743d960e90a10e97056548d3aead0afc4fde1e5cbd428ba822904ffbc
url: https://github.com/bcbio/bcbio-nextgen/archive/affe63d.tar.gz
sha256: c3c53d7e3accfb2ee65d76468631dd6862cf7db16d0fbefe850d03a3a52140c7

requirements:
host:
Expand Down
6 changes: 4 additions & 2 deletions recipes/octopus/build.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
set -eu -o pipefail

cd build
# BOOST -- need up to date version compiled with gcc 7.2
cd build
wget http://dl.bintray.com/boostorg/release/1.65.0/source/boost_1_65_0.tar.gz
tar -xzpf boost_1_65_0.tar.gz
cd boost_1_65_0
Expand All @@ -20,7 +20,9 @@ EOF
toolset=gcc \
cxxflags="${CXXFLAGS}" \
install
cd ..
cd ../..

# octopus
cd build
cmake -DINSTALL_PREFIX=ON -DCMAKE_INSTALL_PREFIX=$PREFIX -DINSTALL_ROOT=ON -DCMAKE_BUILD_TYPE=Release ..
make install
6 changes: 6 additions & 0 deletions recipes/octopus/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
c_compiler:
- gcc # [linux]
- clang # [osx]
cxx_compiler:
- gxx # [linux]
- clangxx # [osx]
3 changes: 3 additions & 0 deletions recipes/octopus/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,18 @@ source:
requirements:
build:
- {{ compiler('c') }}
- {{ compiler('cxx') }}
- cmake
host:
#- boost
- htslib
- wget
- icu
- bzip2
- xz
- zlib
run:
#- boost
- htslib
- icu
- bzip2
Expand Down

0 comments on commit 39ce76c

Please sign in to comment.