Skip to content

Commit

Permalink
might actually work...
Browse files Browse the repository at this point in the history
  • Loading branch information
StefanKarpinski committed Sep 15, 2020
1 parent 3161a39 commit 7ef18fa
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 7 deletions.
5 changes: 4 additions & 1 deletion deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ ifeq ($(USE_SYSTEM_LIBSSH2), 0)
DEP_LIBS += libssh2
endif

DEP_LIBS += nghttp2

ifeq ($(USE_SYSTEM_CURL), 0)
DEP_LIBS += curl
endif
Expand Down Expand Up @@ -176,7 +178,7 @@ install: $(addprefix install-, $(DEP_LIBS))
cleanall: $(addprefix clean-, $(DEP_LIBS))
distcleanall: $(addprefix distclean-, $(DEP_LIBS))
rm -rf $(build_prefix)
getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-curl get-libgit2 get-libwhich
getall: get-llvm get-libuv get-pcre get-openlibm get-dsfmt get-openblas get-lapack get-suitesparse get-unwind get-osxunwind get-gmp get-mpfr get-patchelf get-utf8proc get-objconv get-mbedtls get-libssh2 get-nghttp2 get-curl get-libgit2 get-libwhich

include $(SRCDIR)/llvm.mk
include $(SRCDIR)/libuv.mk
Expand All @@ -193,6 +195,7 @@ include $(SRCDIR)/mpfr.mk
include $(SRCDIR)/patchelf.mk
include $(SRCDIR)/mbedtls.mk
include $(SRCDIR)/libssh2.mk
include $(SRCDIR)/nghttp2.mk
include $(SRCDIR)/curl.mk
include $(SRCDIR)/libgit2.mk
include $(SRCDIR)/libwhich.mk
Expand Down
10 changes: 6 additions & 4 deletions deps/Versions.make
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ GMP_BB_REL = 1
MPFR_VER = 4.1.0
MPFR_BB_REL = 1
PATCHELF_VER = 0.9
MBEDTLS_VER = 2.16.0
MBEDTLS_BB_REL = 1
MBEDTLS_VER = 2.16.8
MBEDTLS_BB_REL = 0
LIBSSH2_VER = 1.9.0
LIBSSH2_BB_REL = 1
CURL_VER = 7.66.0
CURL_BB_REL = 1
CURL_VER = 7.71.1
CURL_BB_REL = 0
NGHTTP2_VER = 1.40.0
NGHTTP2_BB_REL = 2
LIBGIT2_VER = 1.0.1
LIBGIT2_BB_REL = 0
LIBUV_VER = 1.29.1
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
756ae7b6f45d27ca91f0d3f0b1b912ed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec0442d72fa08d589097521b82360f154d54c51f37702b887ee9a8d9e36c189d66b146f7a7d981c0483def3a5b0cb2f5f1363b56f1cf911a53b62e33c776a2c3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2e2027f20798fb0ac1d6a40031024285
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
41c2f309064367f95080f2d1826e84716645e763490c50c7e61eb1616a00dd73f36e203eb56f3814fc99dec0b3adf2fc5f73c5daf63a2ebff522dac39327e5d4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4f2f8a58e8f9fd650493b500bc4b7303
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
581a34923b00cefa52c5abb20f672b399094ac984a53794484b431095497319942fab4e8ca87049c9ed11292f60d4eb996ba5fe3ac0d9aa769c73e07022f50da
6 changes: 6 additions & 0 deletions deps/nghttp2.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
## nghttp2

NGHTTP2_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/nghttp2_jll.jl/releases/download/nghttp2-v$(NGHTTP2_VER)+$(NGHTTP2_BB_REL)
NGHTTP2_BB_NAME := nghttp2.v$(NGHTTP2_VER)

$(eval $(call bb-install,nghttp2,NGHTTP2,false))
4 changes: 2 additions & 2 deletions stdlib/Downloads.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
DOWNLOADS_BRANCH = sk/fix-julia1.6-win64
DOWNLOADS_SHA1 = a94c2d235862e3f2a54f71320aaf1b6578c2bd31
DOWNLOADS_BRANCH = master
DOWNLOADS_SHA1 = a551ad833039bed15a4ef3a173c40b8aaf35aa0e
4 changes: 4 additions & 0 deletions stdlib/LibCURL_jll/src/LibCURL_jll.jl
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,18 @@ libcurl_handle = C_NULL
libcurl_path = ""

if Sys.iswindows()
const libnghttp2 = "libnghttp2-14.dll"
const libcurl = "libcurl-4.dll"
elseif Sys.isapple()
const libnghttp2 = "libnghttp2.14.dylib"
const libcurl = "libcurl.4.dylib"
else
const libnghttp2 = "libnghttp2.so"
const libcurl = "libcurl.so"
end

function __init__()
dlopen(libnghttp2)
global libcurl_handle = dlopen(libcurl)
global libcurl_path = dlpath(libcurl_handle)
end
Expand Down

0 comments on commit 7ef18fa

Please sign in to comment.