From 9ab133d890509ae73a4bf19da7e2715facc022fa Mon Sep 17 00:00:00 2001
From: Jedidiah Carlson <jed.e.carlson@gmail.com>
Date: Sun, 13 Jun 2021 01:16:02 -0700
Subject: [PATCH] [ci skip] Merge PR 28959

Merge PR #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 https://github.com/odelaneau/shapeit4/issues/54#issuecomment-822227117)
 * Bump to latest version (4.2.1)

Recommended by developer to resolve `invalid pointer` error https://github.com/odelaneau/shapeit4/issues/54#issuecomment-822227117
---
 recipes/shapeit4/build.sh  |  2 +-
 recipes/shapeit4/meta.yaml | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/recipes/shapeit4/build.sh b/recipes/shapeit4/build.sh
index 4f9f224845808..85171bea00190 100644
--- a/recipes/shapeit4/build.sh
+++ b/recipes/shapeit4/build.sh
@@ -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
 
diff --git a/recipes/shapeit4/meta.yaml b/recipes/shapeit4/meta.yaml
index f94ebf39d1c03..a4a556a12b50b 100644
--- a/recipes/shapeit4/meta.yaml
+++ b/recipes/shapeit4/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "4.2.0" %}
+{% set version = "4.2.1" %}
 
 package:
   name: shapeit4
@@ -6,11 +6,11 @@ package:
 
 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:
@@ -19,11 +19,11 @@ requirements:
   host:
     - boost-cpp
     - bzip2
-    - htslib
+    - htslib=1.11
   run:
     - boost-cpp
     - bzip2
-    - htslib
+    - htslib=1.11
 
 test:
   commands: