Skip to content

Commit

Permalink
delly: pin boost-cpp (#48756)
Browse files Browse the repository at this point in the history
* pin boost-cpp

* whitespace

* Don't override CXXFLAGS

Overriding this variable as a make argument suppresses CXXFLAGS settings
from both conda-build's environment variable and delly's Makefile. As we
override CXX to use conda's compiler, it will look in $PREFIX/include and
$PREFIX/lib anyway, so adding those explicitly is unnecessary.

In particular, delly's Makefile sets -std=c++11, which will prevent the
build failures due to std::binary_function that are being encountered.

Also use upstream's "make install" target instead of manually copying.

* Remove run requirements in favour of those implied via run_exports

These libraries will add appropriate dependencies themselves via
their run_exports. Apparently libboost needs to be listed though.

---------

Co-authored-by: John Marshall <jmarshall@hey.com>
  • Loading branch information
dfornika and jmarshall authored Jun 27, 2024
1 parent 960a92b commit 67dbbf8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 115 deletions.
5 changes: 2 additions & 3 deletions recipes/delly/build.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/bin/sh

mkdir -p "${PREFIX}/bin"
make all CXX=$CXX CXXFLAGS="-I${PREFIX}/include -L${PREFIX}/lib"
cp src/delly "${PREFIX}/bin"
make CXX="$CXX" all
make prefix="$PREFIX" install
105 changes: 0 additions & 105 deletions recipes/delly/build_failure.osx-64.yaml

This file was deleted.

10 changes: 3 additions & 7 deletions recipes/delly/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ source:
sha256: '{{ sha256 }}'

build:
number: 2
number: 3
run_exports:
- {{ pin_subpackage("delly", max_pin="x.x") }}

Expand All @@ -21,14 +21,10 @@ requirements:
- wget
host:
- zlib
- bzip2
- boost-cpp
- boost-cpp >=1.85.0
- htslib
run:
- zlib
- bzip2
- boost-cpp
- htslib
- libboost >=1.85.0

test:
commands:
Expand Down

0 comments on commit 67dbbf8

Please sign in to comment.