Skip to content

Commit

Permalink
[ci skip] Merge PR 28959
Browse files Browse the repository at this point in the history
Merge PR bioconda#28959, commits were: 
 * pin htslib to 1.11
 * pin htslib to 1.11
 * bump htslib version
 * update htslib version for shapeit4
 * Merge pull request #1 from carjed/patch-1

Update shapeit4 to v4.2.1
 * Update shapeit4 to v4.2.1

Recommended by developer to resolve `invalid pointer` error when using shapeit4 through conda (see odelaneau/shapeit4#54 (comment))
 * Bump to latest version (4.2.1)

Recommended by developer to resolve `invalid pointer` error odelaneau/shapeit4#54 (comment)
  • Loading branch information
carjed authored Jun 13, 2021
1 parent c82743c commit 9ab133d
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion recipes/shapeit4/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
sed -i'.bak' 's/CXX=/CXX?=/g' makefile
sed -i'.bak' 's/CXXFLAG=/CXXFLAG=\$(CXXFLAGS)/g' makefile
sed -i'.bak' 's/LDFLAG=/LDFLAG=\$(LDFLAGS) \${LIBPATH}/g' makefile
sed -i'.bak' 's,HTSLIB_LIB=\$(HOME)/Tools/htslib-1.9/libhts.a,HTSLIB_LIB=-lhts,' makefile
sed -i'.bak' 's,HTSLIB_LIB=\$(HOME)/Tools/htslib-1.11/libhts.a,HTSLIB_LIB=-lhts,' makefile
sed -i'.bak' 's,BOOST_LIB_IO=/usr/lib/x86_64-linux-gnu/libboost_iostreams.a,BOOST_LIB_IO=-lboost_iostreams,' makefile
sed -i'.bak' 's,BOOST_LIB_PO=/usr/lib/x86_64-linux-gnu/libboost_program_options.a,BOOST_LIB_PO=-lboost_program_options,' makefile

Expand Down
10 changes: 5 additions & 5 deletions recipes/shapeit4/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{% set version = "4.2.0" %}
{% set version = "4.2.1" %}

package:
name: shapeit4
version: {{ version }}

source:
url: https://github.com/odelaneau/shapeit4/archive/v{{ version }}.tar.gz
sha256: 329aa920be49b085c96b420d4f42ade7ba92eae8a202ecb2f71ca32a61955588
sha256: 54544dc00c5dc805a8de315c74e14e6d3c382632eee8bc6609c775d1624ccda8

build:
skip: True # [osx]
number: 1
number: 0

requirements:
build:
Expand All @@ -19,11 +19,11 @@ requirements:
host:
- boost-cpp
- bzip2
- htslib
- htslib=1.11
run:
- boost-cpp
- bzip2
- htslib
- htslib=1.11

test:
commands:
Expand Down

0 comments on commit 9ab133d

Please sign in to comment.