-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
Commit
The curl build depends on mbedtls and libssh2 Patch for mbedtls to allow curl to build with mbedtls support Add curl to LICENSE.md, README.md and all the other various locations
- Loading branch information
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -283,6 +283,7 @@ Julia uses the following external libraries, which are automatically downloaded | |
- **[GMP]** (>= 5.0) — GNU multiple precision arithmetic library, needed for `BigInt` support. | ||
- **[MPFR]** (>= 3.0) — GNU multiple precision floating point library, needed for arbitrary precision floating point (`BigFloat`) support. | ||
- **[libgit2]** (>= 0.23) — Git linkable library, used by Julia's package manager | ||
- **[curl]** (>= 7.50) — libcurl provides download and proxy support for Julia's package manager | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
ViralBShah
Author
Member
|
||
- **[libssh2]** (>= 1.7) — library for SSH transport, used by libgit2 for packages with SSH remotes | ||
- **[mbedtls]** (>= 2.2) — library used for cryptography and transport layer security, used by libssh2 | ||
- **[utf8proc]** (>= 2.0) — a library for processing UTF-8 encoded Unicode strings | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,3 +13,4 @@ MPFR_VER = 3.1.4 | |
PATCHELF_VER = 0.9 | ||
VIRTUALENV_VER = 15.0.0 | ||
MBEDTLS_VER = 2.3.0 | ||
CURL_VER = 7.50.1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
015f6a0217ca6f2c5442ca406476920b |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
94acd91fcf8ff2605e1ba2d086c2c366257b61eaf516b9ea44e574e315feb5b30f6e47d89051f259e026ef5dd9edde5f7b15a6af9ee6a38f641da354e1e677b1 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
## CURL ## | ||
|
||
CURL_SRC_TARGET := $(BUILDDIR)/curl-$(CURL_VER)/.libs/libcurl.$(SHLIB_EXT) | ||
CURL_OBJ_TARGET := $(build_shlibdir)/libcurl.$(SHLIB_EXT) | ||
|
||
ifneq ($(OS),WINNT) | ||
CURL_LDFLAGS := $(RPATH_ESCAPED_ORIGIN) | ||
endif | ||
|
||
$(SRCDIR)/srccache/curl-$(CURL_VER).tar.bz2: | $(SRCDIR)/srccache | ||
$(JLDOWNLOAD) $@ https://curl.haxx.se/download/curl-$(CURL_VER).tar.bz2 | ||
$(SRCDIR)/srccache/curl-$(CURL_VER)/configure: $(SRCDIR)/srccache/curl-$(CURL_VER).tar.bz2 $(MBEDTLS_OBJ_TARGET) $(LIBSSH2_OBJ_TARGET) | ||
$(JLCHECKSUM) $< | ||
cd $(dir $<) && $(TAR) jxf $(notdir $<) | ||
touch -c $@ | ||
$(BUILDDIR)/curl-$(CURL_VER)/config.status: $(SRCDIR)/srccache/curl-$(CURL_VER)/configure | ||
mkdir -p $(dir $@) | ||
cd $(dir $@) && \ | ||
$< $(CONFIGURE_COMMON) --includedir=$(build_includedir) --with-mbedtls=$(build_shlibdir)/.. CFLAGS="$(CFLAGS) $(CURL_CFLAGS)" LDFLAGS="$(LDFLAGS) $(CURL_LDFLAGS)" | ||
touch -c $@ | ||
$(CURL_SRC_TARGET): $(BUILDDIR)/curl-$(CURL_VER)/config.status | ||
$(MAKE) -C $(dir $<) $(LIBTOOL_CCLD) | ||
touch -c $@ | ||
$(BUILDDIR)/curl-$(CURL_VER)/checked: $(CURL_SRC_TARGET) | ||
ifeq ($(OS),$(BUILD_OS)) | ||
ifneq ($(OS),WINNT) | ||
$(MAKE) -C $(dir $@) check -j1 | ||
endif | ||
endif | ||
echo 1 > $@ | ||
$(CURL_OBJ_TARGET): $(CURL_SRC_TARGET) | ||
$(call make-install,curl-$(CURL_VER),$(LIBTOOL_CCLD)) | ||
$(INSTALL_NAME_CMD)libcurl.$(SHLIB_EXT) $@ | ||
touch -c $@ | ||
|
||
clean-curl: | ||
-$(MAKE) -C $(BUILDDIR)/curl-$(CURL_VER) clean | ||
-rm -f $(build_shlibdir)/libcurl* | ||
distclean-curl: | ||
-rm -rf $(SRCDIR)/srccache/curl-$(CURL_VER).tar.bz2 $(SRCDIR)/srccache/curl-$(CURL_VER) $(BUILDDIR)/curl-$(CURL_VER) | ||
|
||
get-curl: $(SRCDIR)/srccache/curl-$(CURL_VER).tar.bz2 | ||
configure-curl: $(BUILDDIR)/curl-$(CURL_VER)/config.status | ||
compile-curl: $(CURL_SRC_TARGET) | ||
check-curl: $(BUILDDIR)/curl-$(CURL_VER)/checked | ||
install-curl: $(CURL_OBJ_TARGET) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
--- ssl.h.old 2016-06-28 18:12:06.000000000 +0530 | ||
+++ ssl.h 2016-08-03 18:51:34.000000000 +0530 | ||
@@ -54,7 +54,8 @@ | ||
#endif | ||
|
||
#if defined(MBEDTLS_HAVE_TIME) | ||
-#include <time.h> | ||
+//#include <time.h> | ||
+#include "platform.h" | ||
#endif | ||
|
||
/* |
We don't actually require 7.50 (which is the latest version), right? Let's lower this version dependency.