Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to latest curl, mbedtls, and pcre #23498

Merged
merged 2 commits into from
Aug 31, 2017
Merged

Update to latest curl, mbedtls, and pcre #23498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92caaeb
Update to latest curl, mbedtls, and pcre
tkelman Aug 29, 2017
bcf4765
reason for the pcre patch was solved differently upstream
tkelman Aug 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deps/Versions.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
LLVM_VER = 3.9.1
PCRE_VER = 10.23
PCRE_VER = 10.30
DSFMT_VER = 2.2.3
LAPACK_VER = 3.5.0
ARPACK_VER = 3.3.0
Expand All @@ -9,5 +9,5 @@ OSXUNWIND_VER = 0.0.3
GMP_VER = 6.1.2
MPFR_VER = 3.1.5
PATCHELF_VER = 0.9
MBEDTLS_VER = 2.5.1
CURL_VER = 7.54.1
MBEDTLS_VER = 2.6.0
CURL_VER = 7.55.1
1 change: 0 additions & 1 deletion deps/checksums/curl-7.54.1.tar.bz2/md5
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/curl-7.54.1.tar.bz2/sha512
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/curl-7.55.1.tar.bz2/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8c153f282bbe482495214654cdcd4182
1 change: 1 addition & 0 deletions deps/checksums/curl-7.55.1.tar.bz2/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bfeb39e94b8378519b2efba0a476636b80dbee3434104b98464ee81ce3871eb134e065f52abe8bedb69681b43576cb30655c8be0be6115386859d0cb426d745b
1 change: 0 additions & 1 deletion deps/checksums/mbedtls-2.5.1-apache.tgz/md5
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/mbedtls-2.5.1-apache.tgz/sha512
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/mbedtls-2.5.1-gpl.tgz/md5
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/mbedtls-2.5.1-gpl.tgz/sha512
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/mbedtls-2.6.0-apache.tgz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
01ede06f7d00dd8a6626494d95a63f6b
1 change: 1 addition & 0 deletions deps/checksums/mbedtls-2.6.0-apache.tgz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5eb47d95a31c63e43074a115d141dedae869c43cbe62d5cf7bde11440e14fb8879ac6ed204d0d741b3501b8ba551019a5d47cbdf6673d18b61296be4463e9ffd
1 change: 1 addition & 0 deletions deps/checksums/mbedtls-2.6.0-gpl.tgz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f03b8cf455f246e70e83662d534e156f
1 change: 1 addition & 0 deletions deps/checksums/mbedtls-2.6.0-gpl.tgz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ed0765a476bf8a318fac1389b49d2b42e1a4ac5d4df749d241b24b8c8acea59c62fbb17e4b14057203f16ba7c58b8723ececf74d8a6b065a233a87696155076a
1 change: 0 additions & 1 deletion deps/checksums/pcre2-10.23.tar.bz2/md5
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/pcre2-10.23.tar.bz2/sha512
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions deps/checksums/pcre2-10.30.tar.bz2/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d3adf4b130eed854a530390f00020a65
1 change: 1 addition & 0 deletions deps/checksums/pcre2-10.30.tar.bz2/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f247a9f917c75920793b9919a45bb1426d126246e7a5d04e39d9407e44b5781f894a90cd3d232b385436b2f22be391335ab782664dd3a28c79058a2fcc74dc3e
13 changes: 0 additions & 13 deletions deps/patches/pcre-mingw.patch
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions deps/pcre.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,7 @@ $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted: $(SRCCACHE)/pcre2-$(PCRE_VER).ta
touch -c $(SRCCACHE)/pcre2-$(PCRE_VER)/configure # old target
echo $1 > $@

# patch for mingw build https://bugs.exim.org/show_bug.cgi?id=2067
$(SRCCACHE)/pcre2-$(PCRE_VER)/pcre-mingw.patch-applied: $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted
cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/pcre-mingw.patch
echo 1 > $@

$(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured: $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted $(SRCCACHE)/pcre2-$(PCRE_VER)/pcre-mingw.patch-applied
$(BUILDDIR)/pcre2-$(PCRE_VER)/build-configured: $(SRCCACHE)/pcre2-$(PCRE_VER)/source-extracted
mkdir -p $(dir $@)
cd $(dir $@) && \
$(dir $<)/configure $(CONFIGURE_COMMON) --enable-jit --includedir=$(build_includedir) CFLAGS="$(CFLAGS) $(PCRE_CFLAGS)" LDFLAGS="$(LDFLAGS) $(PCRE_LDFLAGS)"
Expand Down