Skip to content

Commit

Permalink
Drop libcurl support (#10)
Browse files Browse the repository at this point in the history
summary: Recent releases of libcurl broke our static build of htslib. I installed an older release of libcurl, but this didn't fix the problem. Instead of continuing to troubleshoot, we decided to disable libcurl support for this Windows version of htslib (thus disabling S3 support for bcftools and any other tools that rely on htslib for this feature).
  • Loading branch information
jdblischak authored Jul 12, 2024
1 parent e803bb0 commit d8d2f9d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/msys2-htslib-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
env:
PACKAGE_VERSION: 1.19
LIBHTS_SOVERSION: 3
RELEASE_VERSION: 0 # equivalent to conda build number
RELEASE_VERSION: 1 # equivalent to conda build number
jobs:
build:
name: build
Expand Down
2 changes: 1 addition & 1 deletion patches/config.mk.staticlink.patch
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
---
> LIBCURL_LIBS = $(MSYSTEM_PREFIX)/lib/libcurl.a
83c93
< CRYPTO_LIBS = -lcrypto
< CRYPTO_LIBS =
---
> CRYPTO_LIBS = $(MSYSTEM_PREFIX)/lib/libcrypto.a
114a125,144
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-htslib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PATCH_DIR="$1"

LIBHTS_SOVERSION=${LIBHTS_SOVERSION-3}

./configure CFLAGS=-DCURL_STATICLIB
./configure --disable-libcurl

# apply patches
patch Makefile "${PATCH_DIR}/makefile.staticlink.patch"
Expand Down
2 changes: 2 additions & 0 deletions scripts/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ pacman -S --noconfirm --needed \
mingw-w64-x86_64-curl \
mingw-w64-x86_64-tools-git \
mingw-w64-x86_64-libdeflate

pacman -Q

0 comments on commit d8d2f9d

Please sign in to comment.