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.

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

[WIP] Use BinaryBuilder for all available dependencies by default #31441

Merged
merged 20 commits into from
Mar 30, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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
Prev Previous commit
Next Next commit
Add MbedTLS BB tarball
  • Loading branch information
staticfloat committed Mar 27, 2019
commit 691d744b5efb7c7054b9a46f32494db9a3d9099c
2 changes: 1 addition & 1 deletion contrib/refresh_bb_tarballs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
TRIPLETS="i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf powerpc64le-linux-gnu i686-linux-musl x86_64-linux-musl aarch64-linux-musl arm-linux-musleabihf x86_64-apple-darwin14 x86_64-unknown-freebsd11.1 i686-w64-mingw32 x86_64-w64-mingw32"

# These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded:
BB_PROJECTS="gmp"
BB_PROJECTS="gmp mbedtls"
BB_GCC_EXPANDED_PROJECTS="llvm openblas suitesparse openlibm"

# If we've been given a project name, filter down to that one:
Expand Down
1 change: 1 addition & 0 deletions deps/Versions.make
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ GMP_BB_REL = 1
MPFR_VER = 4.0.2
PATCHELF_VER = 0.9
MBEDTLS_VER = 2.16.0
MBEDTLS_BB_REL = v0.17.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a thumbs up here on the right version here for mbedtls 👍 . That's about all I have to contribute in terms of review!

CURL_VER = 7.56.0

# Specify the version of the Mozilla CA Certificate Store to obtain.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0f65b4f1db6eb913fc442bfb9a1cacf1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8a370af19cfc19c0d04495291eb0c18793ab029d5eec8c631b0726eadbf2db93fe6c62f40f27f8111fb919f9e5b49e80958800f0ad2cd77fcd061ac94ecfbaa9
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cde903351d0f20805aa7382e3a187f55
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6db4cd910716fc7c37bbd80e912c9890603f4bd7b63452338eee945e7bf4cec2fe1d989edc064a4562ea1e81062673ab363ab087ba29fcb175800fcaf6f2678d
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
29c08a9e3a32ffbe6a4c4d0929fce3a2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
24310aa24f55b91c80726344d8844f024a09882b298f806a8af6601e1405e40b78b8ab18893912e01c12537554709a9e781d294d3f42dd501ba7cb01c9f10996
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
078fc8029579eb40c68e7744f0bd6af6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
17f3ecfc46799663679562e9dd7021b315db06562687836f376d6168f5778d9ce82d85d4f1a992b3872777931d61585070759b68b213c5f5d6f93a849c772b42
1 change: 1 addition & 0 deletions deps/checksums/MbedTLS.v2.16.0.i686-linux-gnu.tar.gz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
01c763bd84533879267d18752fc59bb1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
365610732ca83b28ea521004b817688edf145eb3808591d228d2c6926106d5630232dec9be6dff6428d86400d9bf3ace15b65e8269cacfb60556db2ebc9d3c64
1 change: 1 addition & 0 deletions deps/checksums/MbedTLS.v2.16.0.i686-linux-musl.tar.gz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a3ebddf1cedc9b5b82266f79f7b35e4a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
69abbe0e0aa6f276d20e30b2d40824c5c60a41d628eb3f4fc83083eefa775e059ab33176c5177db8dbe911dc90f5baa7aedd1b9ecc075d2781bb906bc237e10f
1 change: 1 addition & 0 deletions deps/checksums/MbedTLS.v2.16.0.i686-w64-mingw32.tar.gz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
78de097a872a587afcd593e087119bf3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
596f10ae384e1d66e1c3410997857dde5908af83fe6e8f6aa047aa3dd703eab703e9c67c0759d72ba736a45f5813edb933417a5ce48bcdb7d694c08207239291
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8df9b36147cf90789d621dd080c5ec9c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8bc7dffece424e346664c5edf31531787a7e0ed52509e8211b499df0b396170d3949d813a76f4bfb3ab7d0c60a1914486f915159b1058876994aa3638d0625ee
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
40ce3e865f293c5772bc67c132777038
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fd34b1330cdae41dd4f492c6feff9a663fc6d373c065d664420e6bb982d653e8877185f90533d651ed1cdbed9722eacc095925833dab36c1e9a87857f9ef4d5a
1 change: 1 addition & 0 deletions deps/checksums/MbedTLS.v2.16.0.x86_64-linux-gnu.tar.gz/md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
50ac733ba0dd518cefd3e9b5ec03cdb7
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c0a8796673f8a9cd8be9c697228ba2c57991255d277da719209dbf0a830e4d0a09631d6e25618908cc265e3c9c1952743f30e4fb9dbec5023f0fc79215dbbec5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3cea65e78200e1c5685f1303a97ee98d
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dd08fb48f217b272a1887cbe2afc1c33e218e2d4683ff47a14909829e6781f61eb6667f12b8fb1a6d6d95a7555796bbd156831f1f61f946ed29c58962f3e1989
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7dcb4b2f84470fce6a0eb530fb858cc1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3b84efc17aa2f9030d40a5cd9f605d9e6388557b57279752e2df086128c311be64412b826bd9ef4562398641d773f3293e349bbef5f94cda83493b30df105552
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0505e986a2ef7acdd5aa46db0db9087c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b8bf73f025d8b2f49498ff4d02fc3c35e37a45af487e49e41da7167c74cd2e70e68fccd32e2e3c2fccb5f0fd72a95312e9fe4abb26271d9fb59f61f8b30abe40
10 changes: 10 additions & 0 deletions deps/mbedtls.mk
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## mbedtls

ifneq ($(USE_BINARYBUILDER_MBEDTLS), 1)
ifeq ($(USE_GPL_LIBS), 1)
MBEDTLS_SRC = mbedtls-$(MBEDTLS_VER)-gpl
else
Expand Down Expand Up @@ -86,3 +87,12 @@ compile-mbedtls: $(BUILDDIR)/$(MBEDTLS_SRC)/build-compiled
# tests disabled since they are known to fail
fastcheck-mbedtls: #check-mbedtls
check-mbedtls: $(BUILDDIR)/$(MBEDTLS_SRC)/build-checked

else # USE_BINARYBUILDER_MBEDTLS

MBEDTLS_BB_URL_BASE := https://github.com/JuliaWeb/MbedTLSBuilder/releases/download/$(MBEDTLS_BB_REL)
MBEDTLS_BB_NAME := MbedTLS.v$(MBEDTLS_VER)

$(eval $(call bb-install,mbedtls,MBEDTLS,false))

endif