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

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

Merged
merged 20 commits into from
Mar 30, 2019
Merged

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

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
fd86a1e
Bump BinaryBuilder LLVM to include new patches, GCC ABI Multiversioni…
staticfloat Mar 21, 2019
99a8d03
Add ability for `contrib/refresh_bb_tarballs.sh` to refresh a subset
staticfloat Mar 22, 2019
572eabd
Add GMP BB tarballs
staticfloat Mar 22, 2019
8e907ce
Default to BB turned on for the projects we've precompiled so far,
staticfloat Mar 22, 2019
1a32a99
When `distclean`ing a BB install target, remove the downloaded source…
staticfloat Mar 22, 2019
4f97b74
Move `$(COMMA)` to `Make.inc`, add `$(SPACE)` as well.
staticfloat Mar 25, 2019
3d376f8
Add cxx11 string ABI probing to BB tarball selection
staticfloat Mar 25, 2019
691d744
Add MbedTLS BB tarball
staticfloat Mar 22, 2019
9001ea2
Add `LibSSH2` BB tarball
staticfloat Mar 22, 2019
d89fb51
Add MPFR v4.0.2 BB tarballs
staticfloat Mar 22, 2019
c2bddbc
Update `curl` version to `7.61.0`
staticfloat Mar 22, 2019
8724e37
Add `curl` BB tarball
staticfloat Mar 22, 2019
b9ff412
Add `LibGit2 v0.27.7` BinaryBuilder tarballs
staticfloat Mar 22, 2019
fe53fde
Bump `PCRE` to `10.32`
staticfloat Mar 22, 2019
b5fd37e
Add `PCRE2 v10.32` BB tarballs
staticfloat Mar 22, 2019
bc29074
Add `LibUV` BB tarball
staticfloat Mar 22, 2019
1ae2707
Add `libunwind` and `libosxunwind`
staticfloat Mar 22, 2019
43f160b
Update OpenBLAS `aarch64` BB tarball hashes
staticfloat Mar 25, 2019
058118e
Bump `SuiteSparse` tarballs
staticfloat Mar 26, 2019
09d4e86
Version location cleanup
staticfloat Mar 22, 2019
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 MPFR v4.0.2 BB tarballs
  • Loading branch information
@staticfloat
staticfloat committed Mar 27, 2019
commit d89fb518c7e2e3e0e1f254888142ae6d229dd90a
2 changes: 1 addition & 1 deletion Make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,7 @@ USE_BINARYBUILDER := 0
endif

# This is the set of projects that BinaryBuilder dependencies are hooked up for.
BB_PROJECTS := OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2
BB_PROJECTS := OPENBLAS LLVM SUITESPARSE OPENLIBM GMP MBEDTLS LIBSSH2 MPFR
$(foreach proj,$(BB_PROJECTS),$(eval USE_BINARYBUILDER_$(proj) = $(USE_BINARYBUILDER)))

# Use the Assertions build
Expand Down
2 changes: 1 addition & 1 deletion contrib/refresh_bb_tarballs.sh
View file
Open in desktop
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 mbedtls libssh2"
BB_PROJECTS="gmp mbedtls libssh2 mpfr"
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ OSXUNWIND_VER = 0.0.5
GMP_VER = 6.1.2
GMP_BB_REL = 1
MPFR_VER = 4.0.2
MPFR_BB_REL = 1
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!

Expand Down
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.aarch64-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c6f94172bd91a9bc962b25d32c780055
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.aarch64-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
320daa0a69a54aa17fd043cd3b608448efb54f66aa018aaf898ab894b0d211a22b5912f27960cf979a8108f592ded50debc4ed18737937a08f75649d52db82b1
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.aarch64-linux-musl.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2676878bb2eeb2bdbc286d3d6ade4343
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.aarch64-linux-musl.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f5ac05839e3972767d18a624bff35741617d739ceb1687bec79aaea9bea650296ba540931ab37797f5ef7d818c203a24d2893e762cd12e53245f6bdc05e459ca
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.arm-linux-gnueabihf.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1eb109af64733bb08568cc4551c17ecb
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.arm-linux-gnueabihf.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec7631da9eb724d8db183f70776d4daeb2bf8310656031b18c68e430d823c2342f17f6fd58d1c9e3a4260f14701a62a809acad2edb6f1eaa9287de670f06694a
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.arm-linux-musleabihf.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8a7424a784795dad5c367d85b9a30a01
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.arm-linux-musleabihf.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b671059824e25bfccabf2be4bf54ac4d7bb53f832e44444e3ed4dce870f10a057ea6f5be21bbe82ad310086390c683f97ba2845e532c72fcd869e13f12740e54
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.i686-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
21bc7852ce9c26b6471e4a3f55e0c610
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.i686-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
49d00c3ba290ddcc5be7c11fe263e103c50786ce31b800fb595548f1eb5399fc0af32d344945198908057a25aeb401907957f4f0aed8ee9a78f3709d2a62c7bc
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.i686-linux-musl.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
83fca9e44caadc6c4ab47d1ce8b3c449
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.i686-linux-musl.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d57ae311e165249433fe52af360c10d182e6d35d187e34b11be3e727640aebd849e30f9a50eca5eba22536b688fde6c03d3d2412677bfe512f7c22da171b89b5
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.i686-w64-mingw32.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
914bfc168dd80e7517052941fdcfab72
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.i686-w64-mingw32.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4a3d9b279fffbccb41a8c277f795e411a6a1a115c4990aca3ef6f75b32048373e06c08ca12493a4a43e67e6d37d3004edf30c07b9fedbb9d870fcb7686c4da18
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.powerpc64le-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
13b78290231dc8eb9a4903e25dfca53f
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.powerpc64le-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
323134154a745faf730c47c5f930f518adc2bdc9c9fefb8e474e988d2faf159558bc0952cf3678d29bdedac32a1599c6ee3b6719f242be067f44f9810d08f9b7
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-apple-darwin14.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b575391ea0f9e794d34f6f2ca01f10f5
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-apple-darwin14.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f56af38852cdf7588cab28d6b36a80fa1d0c80e8c2ebcbcaec351faf2f604f7fe621d8bfc7b6a5c39e367ac925852367b95b25f40b0c382fdbfc036875c1b08d
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-linux-gnu.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
db11f249937efb8b963314c16041935d
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-linux-gnu.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c9edb680dd55effc694e37d49d9e11678f5e31118049bd9441b75ae1f98e5e1b7353b0cd847b6f5cb6748f01afaeeabebe05dfbe6141160f6074f07a1196c054
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-linux-musl.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d860593003b141ec81ca92898b380c6c
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-linux-musl.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1e98db18383f5d1532a4a519debbe58b49e74755a19c4a993647f3493942b983221dc0afcfc40ccbde2e31fa93f52215f63ebe06f3142a279f11496660f5f6f1
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-unknown-freebsd11.1.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e51bd192aac6904de836537cce0d59f
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-unknown-freebsd11.1.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
672fa308add4f863d5448bb984ac172abbca65ba54d14fec19afc904d4b170729c1187fda4c53c5ef640e37907708ac0066e11b99f03a0b503a6ef3c29c7e5d3
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-w64-mingw32.tar.gz/md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9448219d9475e7a871024e43e27d4a4e
1 change: 1 addition & 0 deletions deps/checksums/MPFR.v4.0.2.x86_64-w64-mingw32.tar.gz/sha512
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a204160256b6b6d7b9709e5eecad14fe3e4fd26eba4364ccdfcb3ae52a0b372d7e3017fb4f5b1b6955bd8e4bff14bedc3739013f7a9db7a82f642219ecd45872
10 changes: 10 additions & 0 deletions deps/mpfr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ ifeq ($(USE_SYSTEM_GMP), 0)
$(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured: | $(build_prefix)/manifest/gmp
endif

ifneq ($(USE_BINARYBUILDER_MPFR),1)

ifeq ($(USE_SYSTEM_MPFR), 0)
ifeq ($(USE_SYSTEM_GMP), 0)
MPFR_OPTS := --with-gmp-include=$(abspath $(build_includedir)) --with-gmp-lib=$(abspath $(build_shlibdir))
Expand Down Expand Up @@ -70,3 +72,11 @@ configure-mpfr: $(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured
compile-mpfr: $(BUILDDIR)/mpfr-$(MPFR_VER)/build-compiled
fastcheck-mpfr: check-mpfr
check-mpfr: $(BUILDDIR)/mpfr-$(MPFR_VER)/build-checked

else # USE_BINARYBUILDER_MPFR

MPFR_BB_URL_BASE := https://github.com/JuliaPackaging/Yggdrasil/releases/download/MPFR-v$(MPFR_VER)-$(MPFR_BB_REL)
MPFR_BB_NAME := MPFR.v$(MPFR_VER)

$(eval $(call bb-install,mpfr,MPFR,false))
endif