BinaryBuilder dependencies bump (#34242)

BinaryBuilder dependencies bump

Author: staticfloat

contrib/normalize_triplet.py

@@ -31,12 +31,11 @@
     'blank_call_abi': "",
     'eabihf': "eabihf",
 }
-gcc_version_mapping = {
-    'blank_gcc': "",
-    'gcc4': "-gcc4",
-    'gcc7': "-gcc7",
-    'gcc8': "-gcc8",
-    'gcc9': "-gcc8",
+libgfortran_version_mapping = {
+    'blank_libgfortran': "",
+    'libgfortran3': "-libgfortran3",
+    'libgfortran4': "-libgfortran4",
+    'libgfortran5': "-libgfortran5",
 }
 cxx_abi_mapping = {
     'blank_cxx_abi': "",
@@ -53,7 +52,7 @@
     c(platform_mapping)+
     c(libc_mapping)+
     c(call_abi_mapping)+
-    c(gcc_version_mapping)+
+    c(libgfortran_version_mapping)+
     c(cxx_abi_mapping)+
     "$"
 )
@@ -76,7 +75,7 @@ def get_field(m, mapping):
 platform = get_field(m, platform_mapping)
 libc = get_field(m, libc_mapping)
 call_abi = get_field(m, call_abi_mapping)
-gcc_version = get_field(m, gcc_version_mapping)
+libgfortran_version = get_field(m, libgfortran_version_mapping)
 cxx_abi = get_field(m, cxx_abi_mapping)
 
 # The default libc on Linux is glibc
@@ -85,7 +84,7 @@ def get_field(m, mapping):
 
 def r(x):
     x = x.replace("blank_call_abi", "")
-    x = x.replace("blank_gcc", "")
+    x = x.replace("blank_libgfortran", "")
     x = x.replace("blank_cxx_abi", "")
     x = x.replace("blank_libc", "")
     return x
@@ -106,17 +105,17 @@ def p(x):
     return x
 
 # If the user passes in a GCC version (like 8.2.0) use that to force a
-# "-gcc8" tag at the end of the triplet, but only if it has otherwise
+# "-libgfortran5" tag at the end of the triplet, but only if it has otherwise
 # not been specified
-if gcc_version == "blank_gcc":
+if libgfortran_version == "blank_libgfortran":
     if len(sys.argv) >= 3:
-        gcc_version = {
-            "4": "gcc4",
-            "5": "gcc4",
-            "6": "gcc4",
-            "7": "gcc7",
-            "8": "gcc8",
-            "9": "gcc8",
+        libgfortran_version = {
+            "4": "libgfortran3",
+            "5": "libgfortran3",
+            "6": "libgfortran3",
+            "7": "libgfortran4",
+            "8": "libgfortran5",
+            "9": "libgfortran5",
         }[list(filter(lambda x: re.match("\d+\.\d+(\.\d+)?", x), sys.argv[2].split()))[-1][0]]
 
 if cxx_abi == "blank_cxx_abi":
@@ -127,7 +126,7 @@ def p(x):
             "": "",
         }[sys.argv[3]]
 
-print(arch+p(platform)+p(libc)+r(call_abi)+p(gcc_version)+p(cxx_abi))
+print(arch+p(platform)+p(libc)+r(call_abi)+p(libgfortran_version)+p(cxx_abi))
 
 # Testing suite:
 # triplets="i686-w64-mingw32 x86_64-pc-linux-musl arm-linux-musleabihf x86_64-linux-gnu arm-linux-gnueabihf x86_64-apple-darwin14 x86_64-unknown-freebsd11.1"

contrib/refresh_bb_tarballs.sh

@@ -12,8 +12,8 @@
 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 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse"
-BB_GCC_EXPANDED_PROJECTS="llvm openblas openlibm"
+BB_PROJECTS="gmp mbedtls libssh2 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm"
+BB_GCC_EXPANDED_PROJECTS="llvm openblas"
 
 # If we've been given a project name, filter down to that one:
 if [ -n "${1}" ]; then
@@ -40,9 +40,9 @@ for triplet in ${TRIPLETS}; do
 
     for proj in ${BB_GCC_EXPANDED_PROJECTS}; do
 		PROJ="$(echo ${proj} | tr [a-z] [A-Z])"
-        for gcc in gcc4 gcc7 gcc8; do
-		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${gcc} BB_TRIPLET_CXXABI=${triplet} distclean-${proj}
-		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${gcc} BB_TRIPLET_CXXABI=${triplet} install-${proj}
+        for libgfortran in libgfortran3 libgfortran4 libgfortran5; do
+		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${libgfortran} BB_TRIPLET_CXXABI=${triplet} distclean-${proj}
+		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${libgfortran} BB_TRIPLET_CXXABI=${triplet} install-${proj}
         done
     done
 done

deps/Versions.make

@@ -4,12 +4,12 @@ PCRE_VER = 10.31
 PCRE_BB_REL = 0
 DSFMT_VER = 2.2.3
 DSFMT_BB_REL = 0
-OPENBLAS_VER = 0.3.5
-OPENBLAS_BB_REL = 0
+OPENBLAS_VER = 0.3.7
+OPENBLAS_BB_REL = 2
 LAPACK_VER = 3.5.0
 SUITESPARSE_VER = 5.4.0
 SUITESPARSE_BB_REL = 2
-OPENLIBM_VER = 0.6.0
+OPENLIBM_VER = 0.7.0
 OPENLIBM_BB_REL = 0
 UNWIND_VER = 1.3.1
 UNWIND_BB_REL = 4

deps/blas.mk

@@ -94,17 +94,12 @@ OPENBLAS_BUILD_OPTS += MAKE_NB_JOBS=0
 
 ifneq ($(USE_BINARYBUILDER_OPENBLAS), 1)
 
-$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-skylakexdgemm.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/source-extracted
-	cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && \
-		patch -p1 -f < $(SRCDIR)/patches/openblas-skylakexdgemm.patch
-	echo 1 > $@
-
 $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-winexit.patch-applied: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/source-extracted
 	cd $(BUILDDIR)/$(OPENBLAS_SRC_DIR) && \
 		patch -p1 -f < $(SRCDIR)/patches/openblas-winexit.patch
 	echo 1 > $@
 
-$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-skylakexdgemm.patch-applied $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-winexit.patch-applied
+$(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/openblas-winexit.patch-applied
 	echo 1 > $@
 
 $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-compiled: $(BUILDDIR)/$(OPENBLAS_SRC_DIR)/build-configured