From 0ccbcd50389dde87c97c2087899c949eddd9afcd Mon Sep 17 00:00:00 2001 From: ~locpyl-tidnyd Date: Thu, 3 Jun 2021 01:43:07 +0300 Subject: [PATCH] vere: mingw: bump curl version and get rid of CURLOPT_SSL_CTX_FUNCTION typecheck warning --- nix/sources-mingw.json | 6 +++--- pkg/urbit/compat/mingw/compat.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/sources-mingw.json b/nix/sources-mingw.json index ae3a2d59f0..25f9c32d7f 100644 --- a/nix/sources-mingw.json +++ b/nix/sources-mingw.json @@ -6,14 +6,14 @@ "mingw": { "include": "include", "lib": "lib/.libs", - "prepare": "autoreconf -vfi && ./configure --disable-shared --disable-ldap --disable-rtsp --without-brotli --without-libidn2 --without-libpsl --without-nghttp2", + "prepare": "autoreconf -vfi && ./configure --disable-shared --disable-ldap --disable-rtsp --without-brotli --without-libidn2 --without-libpsl --without-nghttp2 --with-openssl", "make": "-C lib libcurl.la" }, "owner": "curl", "repo": "curl", - "rev": "curl-7_75_0", + "rev": "curl-7_77_0", "type": "tarball", - "url": "https://github.com/curl/curl/archive/curl-7_75_0.tar.gz", + "url": "https://github.com/curl/curl/archive/curl-7_77_0.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "lmdb": { diff --git a/pkg/urbit/compat/mingw/compat.mk b/pkg/urbit/compat/mingw/compat.mk index 3aece861b4..0bc9eaa87f 100644 --- a/pkg/urbit/compat/mingw/compat.mk +++ b/pkg/urbit/compat/mingw/compat.mk @@ -2,7 +2,7 @@ LDFLAGS := $(LDFLAGS) -Wl,--stack,67108864 -lbcrypt -lntdll -lws2_32 # libcurl CFLAGS := $(CFLAGS) -DCURL_STATICLIB -LDFLAGS := $(LDFLAGS) -lzstd +LDFLAGS := $(LDFLAGS) -lzstd -lcrypt32 # libh2o CFLAGS := $(CFLAGS) -DH2O_NO_UNIX_SOCKETS # libuv