Skip to content

Commit

Permalink
[ci skip] Merge PR 39296
Browse files Browse the repository at this point in the history
Merge PR bioconda#39296, commits were: 
 * fix onetbb flexbar issue

- add patch with onetbb support
  - migrates flexbar from tbb to onetbb to allow building against current conda-forge tbb version
  - upstream PR for these changes: seqan/flexbar#41 (but repo doesn't appear to be maintained)
- remove flexbar from build blacklist
  • Loading branch information
lkeegan authored and cokelaer committed Apr 28, 2023
1 parent 61ae54c commit 371575e
Show file tree
Hide file tree
Showing 3 changed files with 556 additions and 4 deletions.
3 changes: 0 additions & 3 deletions build-fail-blacklist
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ recipes/bioconductor-snplocs.hsapiens.dbsnp155.grch38
# x86_64-conda-linux-gnu-cc: error: unrecognized command-line option '-R'
recipes/ncbi-util-legacy

# TBB compatibility, https://github.com/seqan/flexbar/issues/38
recipes/flexbar

# HDF5 compatibility, https://github.com/mateidavid/nanocall/issues/38
recipes/nanocall

Expand Down
3 changes: 2 additions & 1 deletion recipes/flexbar/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ source:
sha256: "{{ sha256 }}"
patches:
- march.patch
- onetbb.patch

build:
number: 7
number: 8

requirements:
build:
Expand Down
Loading

0 comments on commit 371575e

Please sign in to comment.