From ba0d45d88280223c757ccadb85129f5ed229ff97 Mon Sep 17 00:00:00 2001 From: woclass Date: Thu, 16 Jun 2022 15:09:20 +0800 Subject: [PATCH 01/22] deps: split `Versions.make` into standalone `*.version` file --- deps/Versions.make | 118 +----------------------------------- deps/blastrampoline.version | 5 ++ deps/csl.version | 2 + deps/curl.version | 5 ++ deps/dsfmt.version | 5 ++ deps/gmp.version | 5 ++ deps/libgit2.version | 10 +++ deps/libssh2.version | 5 ++ deps/libsuitesparse.version | 5 ++ deps/libuv.version | 5 ++ deps/llvm.version | 17 ++++++ deps/mbedtls.version | 5 ++ deps/mpfr.version | 5 ++ deps/nghttp2.version | 5 ++ deps/objconv.version | 7 +++ deps/openblas.version | 8 +++ deps/openlibm.version | 5 ++ deps/p7zip.version | 5 ++ deps/patchelf.version | 3 + deps/pcre.version | 5 ++ deps/unwind.version | 16 +++++ deps/zlib.version | 5 ++ 22 files changed, 134 insertions(+), 117 deletions(-) create mode 100644 deps/csl.version create mode 100644 deps/curl.version create mode 100644 deps/dsfmt.version create mode 100644 deps/gmp.version create mode 100644 deps/libsuitesparse.version create mode 100644 deps/mbedtls.version create mode 100644 deps/mpfr.version create mode 100644 deps/nghttp2.version create mode 100644 deps/objconv.version create mode 100644 deps/p7zip.version create mode 100644 deps/patchelf.version create mode 100644 deps/pcre.version create mode 100644 deps/unwind.version diff --git a/deps/Versions.make b/deps/Versions.make index f864f38089036..bcb591abd7502 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -1,117 +1 @@ -## Dependencies and where to find them, listed in alphabetical order - -# To define a new dependency, you need to know the following pieces of information: -# -# * The Makefile variable stem; for LibCURL this is just "CURL". -# * The JLL name; for GMP this is "GMP", while for LLVM it could be "LLVM_full" or "LLVM_full_assert" -# * The upstream source version; for dSFMT this is currently "2.2.3" -# -# Everything else will be auto-generated. In particular, the version listed here -# represents the upstream source version; the JLL binary version that gets downloaded is -# controlled by the `Project.toml` files in `stdlib/XXX_jll/`. - -# Compiler Support Libraries -CSL_JLL_NAME := CompilerSupportLibraries - -# Clang (paired with LLVM, only here as a JLL download) -CLANG_JLL_NAME := Clang -CLANG_JLL_VER := 13.0.1+0 - -# DSFMT -DSFMT_VER := 2.2.4 -DSFMT_JLL_NAME := dSFMT - -# GMP -GMP_VER := 6.2.1 -GMP_JLL_NAME := GMP - -# LibCURL -CURL_VER := 7.83.1 -CURL_JLL_NAME := LibCURL - -# LAPACK, source-only -LAPACK_VER := 3.9.0 - -# LibGit2 -LIBGIT2_JLL_NAME := LibGit2 - -# LibSSH2 -LIBSSH2_VER := 1.10.2 -LIBSSH2_JLL_NAME := LibSSH2 - -# LibUV -LIBUV_VER := 2 -LIBUV_JLL_NAME := LibUV - -# LLVM -LLVM_VER := 13.0.1 -LLVM_ASSERT_JLL_VER := 13.0.1+0 -LLVM_JLL_NAME := libLLVM - -# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) -LLVM_TOOLS_JLL_NAME := LLVM -LLVM_TOOLS_JLL_VER := 13.0.1+0 -LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0 - -# LLVM libunwind -LLVMUNWIND_VER := 12.0.1 -LLVMUNWIND_JLL_NAME := LLVMLibUnwind - -# MbedTLS -MBEDTLS_VER := 2.28.0 -MBEDTLS_JLL_NAME := MbedTLS - -# MPFR -MPFR_VER := 4.1.0 -MPFR_JLL_NAME := MPFR - -# nghttp2 -NGHTTP2_VER := 1.47.0 -NGHTTP2_JLL_NAME := nghttp2 - -# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here) -OBJCONV_VER := 2.49.1 -OBJCONV_JLL_NAME := Objconv -OBJCONV_JLL_VER := 2.49.1+0 - -# blastrampoline -BLASTRAMPOLINE_VER := 5.1.0 -BLASTRAMPOLINE_JLL_NAME := libblastrampoline - -# OpenBLAS -OPENBLAS_VER := 0.3.17 -OPENBLAS_JLL_NAME := OpenBLAS - -# OpenLibm -OPENLIBM_VER := 0.8.1 -OPENLIBM_JLL_NAME := OpenLibm - -# Patchelf (we don't ship this or even use a JLL, we just always build it) -PATCHELF_VER := 0.13 - -# p7zip -P7ZIP_VER := 17.04 -P7ZIP_JLL_NAME := p7zip - -# PCRE -PCRE_VER := 10.40 -PCRE_JLL_NAME := PCRE2 - -# SuiteSparse -LIBSUITESPARSE_VER := 5.10.1 -LIBSUITESPARSE_JLL_NAME := SuiteSparse - -# unwind -UNWIND_VER := 1.5.0 -UNWIND_VER_TAG := 1.5 -UNWIND_JLL_NAME := LibUnwind -UNWIND_JLL_VER := 1.5.0+1 - -# zlib -ZLIB_VER := 1.2.12 -ZLIB_JLL_NAME := Zlib - -# Specify the version of the Mozilla CA Certificate Store to obtain. -# The versions of cacert.pem are identified by the date (YYYY-MM-DD) of their changes. -# See https://curl.haxx.se/docs/caextract.html for more details. -MOZILLA_CACERT_VERSION := 2022-02-01 +# TODO: rm this diff --git a/deps/blastrampoline.version b/deps/blastrampoline.version index 23074f70854dc..63d57de28e7bb 100644 --- a/deps/blastrampoline.version +++ b/deps/blastrampoline.version @@ -1,2 +1,7 @@ +## jll artifact +BLASTRAMPOLINE_JLL_NAME := libblastrampoline + +## source build +BLASTRAMPOLINE_VER := 5.1.0 BLASTRAMPOLINE_BRANCH=v5.0.1 BLASTRAMPOLINE_SHA1=d32042273719672c6669f6442a0be5605d434b70 diff --git a/deps/csl.version b/deps/csl.version new file mode 100644 index 0000000000000..74ce0a588d375 --- /dev/null +++ b/deps/csl.version @@ -0,0 +1,2 @@ +## jll artifact +CSL_JLL_NAME := CompilerSupportLibraries diff --git a/deps/curl.version b/deps/curl.version new file mode 100644 index 0000000000000..d5f213faa59b1 --- /dev/null +++ b/deps/curl.version @@ -0,0 +1,5 @@ +## jll artifact +CURL_JLL_NAME := LibCURL + +## source build +CURL_VER := 7.83.1 diff --git a/deps/dsfmt.version b/deps/dsfmt.version new file mode 100644 index 0000000000000..21ca57beefc20 --- /dev/null +++ b/deps/dsfmt.version @@ -0,0 +1,5 @@ +## jll artifact +DSFMT_JLL_NAME := dSFMT + +## source build +DSFMT_VER := 2.2.4 diff --git a/deps/gmp.version b/deps/gmp.version new file mode 100644 index 0000000000000..da6da2dae5d3f --- /dev/null +++ b/deps/gmp.version @@ -0,0 +1,5 @@ +## jll artifact +GMP_JLL_NAME := GMP + +## source build +GMP_VER := 6.2.1 diff --git a/deps/libgit2.version b/deps/libgit2.version index 042f76bba673e..9d4b3c59c64d9 100644 --- a/deps/libgit2.version +++ b/deps/libgit2.version @@ -1,2 +1,12 @@ +## jll artifact +LIBGIT2_JLL_NAME := LibGit2 + +## source build LIBGIT2_BRANCH=v1.3.0 LIBGIT2_SHA1=b7bad55e4bb0a285b073ba5e02b01d3f522fc95d + +## Other deps +# Specify the version of the Mozilla CA Certificate Store to obtain. +# The versions of cacert.pem are identified by the date (YYYY-MM-DD) of their changes. +# See https://curl.haxx.se/docs/caextract.html for more details. +MOZILLA_CACERT_VERSION := 2022-02-01 diff --git a/deps/libssh2.version b/deps/libssh2.version index 1c4d5412c0c09..3d5b2bb98d7eb 100644 --- a/deps/libssh2.version +++ b/deps/libssh2.version @@ -1,2 +1,7 @@ +## jll artifact +LIBSSH2_JLL_NAME := LibSSH2 + +## source build +LIBSSH2_VER := 1.10.2 LIBSSH2_BRANCH=libssh2-1.10.0 LIBSSH2_SHA1=635caa90787220ac3773c1d5ba11f1236c22eae8 diff --git a/deps/libsuitesparse.version b/deps/libsuitesparse.version new file mode 100644 index 0000000000000..18f74eae5d815 --- /dev/null +++ b/deps/libsuitesparse.version @@ -0,0 +1,5 @@ +## jll artifact +LIBSUITESPARSE_JLL_NAME := SuiteSparse + +## source build +LIBSUITESPARSE_VER := 5.10.1 diff --git a/deps/libuv.version b/deps/libuv.version index 0c6bdaaf78b58..b42428669ca87 100644 --- a/deps/libuv.version +++ b/deps/libuv.version @@ -1,2 +1,7 @@ +## jll artifact +LIBUV_JLL_NAME := LibUV + +## source build +LIBUV_VER := 2 LIBUV_BRANCH=julia-uv2-1.44.1 LIBUV_SHA1=1b2d16477fe1142adea952168d828a066e03ee4c diff --git a/deps/llvm.version b/deps/llvm.version index ed9cfbcfc7a25..c2c03b5344715 100644 --- a/deps/llvm.version +++ b/deps/llvm.version @@ -1,2 +1,19 @@ +## jll artifact +# LLVM +LLVM_JLL_NAME := libLLVM +LLVM_ASSERT_JLL_VER := 13.0.1+0 + +# Clang (paired with LLVM, only here as a JLL download) +CLANG_JLL_NAME := Clang +CLANG_JLL_VER := 13.0.1+0 + +# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) +LLVM_TOOLS_JLL_NAME := LLVM +LLVM_TOOLS_JLL_VER := 13.0.1+0 +LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0 + + +## source build +LLVM_VER := 13.0.1 LLVM_BRANCH=julia-13.0.1-0 LLVM_SHA1=julia-13.0.1-0 diff --git a/deps/mbedtls.version b/deps/mbedtls.version new file mode 100644 index 0000000000000..3814047352039 --- /dev/null +++ b/deps/mbedtls.version @@ -0,0 +1,5 @@ +## jll artifact +MBEDTLS_JLL_NAME := MbedTLS + +## source build +MBEDTLS_VER := 2.28.0 diff --git a/deps/mpfr.version b/deps/mpfr.version new file mode 100644 index 0000000000000..1a06213a70a63 --- /dev/null +++ b/deps/mpfr.version @@ -0,0 +1,5 @@ +## jll artifact +MPFR_JLL_NAME := MPFR + +## source build +MPFR_VER := 4.1.0 diff --git a/deps/nghttp2.version b/deps/nghttp2.version new file mode 100644 index 0000000000000..b885a2c1266b5 --- /dev/null +++ b/deps/nghttp2.version @@ -0,0 +1,5 @@ +## jll artifact +NGHTTP2_JLL_NAME := nghttp2 + +## source build +NGHTTP2_VER := 1.47.0 diff --git a/deps/objconv.version b/deps/objconv.version new file mode 100644 index 0000000000000..ab7c43a33af91 --- /dev/null +++ b/deps/objconv.version @@ -0,0 +1,7 @@ +## jll artifact +# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here) +OBJCONV_JLL_NAME := Objconv +OBJCONV_JLL_VER := 2.49.1+0 + +## source build +OBJCONV_VER := 2.49.1 diff --git a/deps/openblas.version b/deps/openblas.version index ceb01600b0ea7..2c73c5c2ef441 100644 --- a/deps/openblas.version +++ b/deps/openblas.version @@ -1,2 +1,10 @@ +## jll artifact +OPENBLAS_JLL_NAME := OpenBLAS + +## source build +OPENBLAS_VER := 0.3.17 OPENBLAS_BRANCH=v0.3.20 OPENBLAS_SHA1=0b678b19dc03f2a999d6e038814c4c50b9640a4e + +# LAPACK, source-only +LAPACK_VER := 3.9.0 diff --git a/deps/openlibm.version b/deps/openlibm.version index 9edba0c1f257b..f35b291260380 100644 --- a/deps/openlibm.version +++ b/deps/openlibm.version @@ -1,2 +1,7 @@ +## jll artifact +OPENLIBM_JLL_NAME := OpenLibm + +## source build +OPENLIBM_VER := 0.8.1 OPENLIBM_BRANCH=v0.8.1 OPENLIBM_SHA1=ae2d91698508701c83cab83714d42a1146dccf85 diff --git a/deps/p7zip.version b/deps/p7zip.version new file mode 100644 index 0000000000000..b43840034bc7e --- /dev/null +++ b/deps/p7zip.version @@ -0,0 +1,5 @@ +## jll artifact +P7ZIP_JLL_NAME := p7zip + +## source build +P7ZIP_VER := 17.04 diff --git a/deps/patchelf.version b/deps/patchelf.version new file mode 100644 index 0000000000000..3f9417e564b15 --- /dev/null +++ b/deps/patchelf.version @@ -0,0 +1,3 @@ +## source build +# Patchelf (we don't ship this or even use a JLL, we just always build it) +PATCHELF_VER := 0.13 diff --git a/deps/pcre.version b/deps/pcre.version new file mode 100644 index 0000000000000..f31b254370e6c --- /dev/null +++ b/deps/pcre.version @@ -0,0 +1,5 @@ +## jll artifact +PCRE_JLL_NAME := PCRE2 + +## source build +PCRE_VER := 10.40 diff --git a/deps/unwind.version b/deps/unwind.version new file mode 100644 index 0000000000000..c706e552fa248 --- /dev/null +++ b/deps/unwind.version @@ -0,0 +1,16 @@ +## jll artifact +# LibUnwind +UNWIND_JLL_NAME := LibUnwind +UNWIND_JLL_VER := 1.5.0+1 + +# LLVM libunwind +LLVMUNWIND_JLL_NAME := LLVMLibUnwind + + +## source build +# LibUnwind +UNWIND_VER_TAG := 1.5 +UNWIND_VER := 1.5.0 + +# LLVM libunwind +LLVMUNWIND_VER := 12.0.1 diff --git a/deps/zlib.version b/deps/zlib.version index 0b16a7f662dd1..c6a295882a7ce 100644 --- a/deps/zlib.version +++ b/deps/zlib.version @@ -1,2 +1,7 @@ +## jll artifact +ZLIB_JLL_NAME := Zlib + +## source build +ZLIB_VER := 1.2.12 ZLIB_BRANCH=v1.2.12 ZLIB_SHA1=21767c654d31d2dccdde4330529775c6c5fd5389 From 392056458c08084cd94b19aed98a712c48b95a1d Mon Sep 17 00:00:00 2001 From: woclass Date: Thu, 16 Jun 2022 15:22:13 +0800 Subject: [PATCH 02/22] repo: update `julia.spdx.json` --- julia.spdx.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/julia.spdx.json b/julia.spdx.json index d90a4e40e3273..2e7e368a49c0d 100644 --- a/julia.spdx.json +++ b/julia.spdx.json @@ -164,7 +164,7 @@ "downloadLocation": "git+https://github.com/MersenneTwister-Lab/dSFMT.git", "filesAnalyzed": false, "homepage": "https://github.com/MersenneTwister-Lab/dSFMT", - "sourceInfo": "The git hash of the version in use can be found in the file deps/Versions.make", + "sourceInfo": "The git hash of the version in use can be found in the file deps/dsfmt.version", "licenseConcluded": "BSD-3-Clause", "licenseDeclared": "BSD-3-Clause", "copyrightText": "Copyright (c) 2007, 2008, 2009 Mutsuo Saito, Makoto Matsumoto and Hiroshima University. Copyright (c) 2011, 2002 Mutsuo Saito, Makoto Matsumoto, Hiroshima University and The University of Tokyo.", @@ -188,7 +188,7 @@ "downloadLocation": "https://gmplib.org/download/gmp/", "filesAnalyzed": false, "homepage": "https://gmplib.org/", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/gmp.version", "licenseConcluded": "LGPL-3.0-or-later", "licenseDeclared": "LGPL-3.0-or-later OR GPL-2.0-or-later", "copyrightText": "Copyright 1991, 1996, 1999, 2000, 2007 Free Software Foundation, Inc.", @@ -212,7 +212,7 @@ "downloadLocation": "git+https://github.com/curl/curl.git", "filesAnalyzed": false, "homepage": "https://curl.se", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/curl.version", "licenseConcluded": "curl", "licenseDeclared": "curl", "copyrightText": "Copyright (c) 1996 - 2021, Daniel Stenberg, daniel@haxx.se, and many contributors, see the THANKS file.", @@ -236,7 +236,7 @@ "downloadLocation": "git+https://github.com/ARMmbed/mbedtls.git", "filesAnalyzed": false, "homepage": "https://tls.mbed.org", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/mbedtls.version", "licenseConcluded": "Apache-2.0", "licenseDeclared": "Apache-2.0", "copyrightText": "NOASSERTION", @@ -248,7 +248,7 @@ "downloadLocation": "https://www.mpfr.org/", "filesAnalyzed": false, "homepage": "https://www.mpfr.org/", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/mpfr.version", "licenseConcluded": "LGPL-3.0-or-later", "licenseDeclared": "LGPL-3.0-or-later", "copyrightText": "Copyright 2000-2020 Free Software Foundation, Inc.", @@ -272,7 +272,7 @@ "downloadLocation": "https://www.netlib.org/lapack/", "filesAnalyzed": false, "homepage": "https://netlib.org/", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/openblas.version", "licenseConcluded": "BSD-3-Clause", "licenseDeclared": "BSD-3-Clause", "copyrightText": "Copyright (c) 1992-2013 The University of Tennessee and The University of Tennessee Research Foundation. All rights reserved.\nCopyright (c) 2000-2013 The University of California Berkeley. All rights reserved.\nCopyright (c) 2006-2013 The University of Colorado Denver. All rights reserved.", @@ -284,7 +284,7 @@ "downloadLocation": "git+https://github.com/PhilipHazel/pcre2.git", "filesAnalyzed": false, "homepage": "https://www.pcre.org", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/pcre.version", "licenseConcluded": "BSD-3-Clause", "licenseDeclared": "BSD-3-Clause", "copyrightText": "Copyright (c) 1997-2021 University of Cambridge All rights reserved.\nCopyright(c) 2009-2021 Zoltan Herczeg\n", @@ -297,7 +297,7 @@ "downloadLocation": "git+https://github.com/DrTimothyAldenDavis/SuiteSparse.git", "filesAnalyzed": false, "homepage": "https://people.engr.tamu.edu/davis/suitesparse.html", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/libsuitesparse.version", "licenseConcluded": "GPL-2.0-or-later", "licenseDeclared": "LGPL-2.0-or-later AND GPL-2.0-or-later AND BSD-3 AND Apache-2.0 ", "licenseComments": "SuiteSparse consists of many modules, each of which is licensed separately.", @@ -334,7 +334,7 @@ "downloadLocation": "git+https://github.com/libunwind/libunwind.git", "filesAnalyzed": false, "homepage": "http://www.nongnu.org/libunwind/", - "sourceInfo": "The git hash of the version in use can be found in the file deps/Versions.make", + "sourceInfo": "The git hash of the version in use can be found in the file deps/unwind.version", "licenseConcluded": "MIT", "licenseDeclared": "MIT", "copyrightText": "Copyright (c) 2002 Hewlett-Packard Co.", @@ -388,7 +388,7 @@ "downloadLocation": "https://sourceforge.net/projects/p7zip/files/p7zip", "filesAnalyzed": false, "homepage": "https://www.7-zip.org", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/p7zip.version", "licenseConcluded": "LGPL-3.0-or-later", "licenseDeclared": "LGPL-3.0-or-later AND BSD-3", "copyrightText": "Copyright (C) 1999-2021 Igor Pavlov", @@ -412,7 +412,7 @@ "downloadLocation": "git+https://github.com/NixOS/patchelf.git", "filesAnalyzed": false, "homepage": "https://nixos.org/patchelf.html", - "sourceInfo": "The version in use can be found in the file deps/Versions.make", + "sourceInfo": "The version in use can be found in the file deps/patchelf.version", "licenseConcluded": "GPL-3.0-or-later", "licenseDeclared": "GPL-3.0-or-later", "copyrightText": "Copyright (C) 2007 Free Software Foundation, Inc. ", From b33e5c26969cad540a8210d509fe294f5e3fa96b Mon Sep 17 00:00:00 2001 From: woclass Date: Thu, 16 Jun 2022 15:27:02 +0800 Subject: [PATCH 03/22] deps: rm `Versions.make` --- base/Makefile | 1 - cli/Makefile | 1 - deps/Makefile | 1 - deps/Versions.make | 1 - doc/src/devdocs/build/build.md | 2 +- doc/src/devdocs/llvm.md | 2 +- src/Makefile | 1 - stdlib/Makefile | 3 +-- 8 files changed, 3 insertions(+), 9 deletions(-) delete mode 100644 deps/Versions.make diff --git a/base/Makefile b/base/Makefile index 72b3ed145605e..1c1901e9499fb 100644 --- a/base/Makefile +++ b/base/Makefile @@ -1,7 +1,6 @@ SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) BUILDDIR := . JULIAHOME := $(abspath $(SRCDIR)/..) -include $(JULIAHOME)/deps/Versions.make include $(JULIAHOME)/Make.inc TAGGED_RELEASE_BANNER := "" diff --git a/cli/Makefile b/cli/Makefile index 11855ee6244dc..e5298a8da7619 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -1,7 +1,6 @@ SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) JULIAHOME := $(abspath $(SRCDIR)/..) BUILDDIR ?= . -include $(JULIAHOME)/deps/Versions.make include $(JULIAHOME)/Make.inc include $(JULIAHOME)/deps/llvm-ver.make diff --git a/deps/Makefile b/deps/Makefile index ac0dbe7afcb1a..6c0bc6de86c54 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -8,7 +8,6 @@ BUILDDIR := scratch else BUILDDIR := . endif -include $(SRCDIR)/Versions.make include $(JULIAHOME)/Make.inc include $(SRCDIR)/tools/common.mk include $(SRCDIR)/tools/git-external.mk diff --git a/deps/Versions.make b/deps/Versions.make deleted file mode 100644 index bcb591abd7502..0000000000000 --- a/deps/Versions.make +++ /dev/null @@ -1 +0,0 @@ -# TODO: rm this diff --git a/doc/src/devdocs/build/build.md b/doc/src/devdocs/build/build.md index 091a15d892513..4d410e46c4be9 100644 --- a/doc/src/devdocs/build/build.md +++ b/doc/src/devdocs/build/build.md @@ -167,7 +167,7 @@ Julia uses the following external libraries, which are automatically downloaded (or in a few cases, included in the Julia source repository) and then compiled from source the first time you run `make`. The specific version numbers of these libraries that Julia -uses are listed in [`deps/Versions.make`](https://github.com/JuliaLang/julia/blob/master/deps/Versions.make): +uses are listed in [`deps/$(LibName).version`](https://github.com/JuliaLang/julia/blob/master/deps/): - **[LLVM]** (9.0 + [patches](https://github.com/JuliaLang/julia/tree/master/deps/patches)) — compiler infrastructure (see [note below](#llvm)). - **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end. diff --git a/doc/src/devdocs/llvm.md b/doc/src/devdocs/llvm.md index b9890b5d7fe3e..9a833ca8af516 100644 --- a/doc/src/devdocs/llvm.md +++ b/doc/src/devdocs/llvm.md @@ -38,7 +38,7 @@ The `-O` option enables LLVM's [Basic Alias Analysis](https://llvm.org/docs/Alia ## Building Julia with a different version of LLVM -The default version of LLVM is specified in `deps/Versions.make`. You can override it by creating +The default version of LLVM is specified in `deps/llvm.version`. You can override it by creating a file called `Make.user` in the top-level directory and adding a line to it such as: ``` diff --git a/src/Makefile b/src/Makefile index ce283fa43e0ef..4801f94fe0c19 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,7 +1,6 @@ SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))) JULIAHOME := $(abspath $(SRCDIR)/..) BUILDDIR := . -include $(JULIAHOME)/deps/Versions.make include $(JULIAHOME)/Make.inc include $(JULIAHOME)/deps/llvm-ver.make diff --git a/stdlib/Makefile b/stdlib/Makefile index 44c3b97e2fb0f..438815e9277cd 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -6,7 +6,6 @@ SRCCACHE := $(abspath $(SRCDIR)/srccache) BUILDDIR := . include $(JULIAHOME)/Make.inc -include $(JULIAHOME)/deps/Versions.make include $(JULIAHOME)/deps/tools/common.mk include $(JULIAHOME)/deps/tools/stdlib-external.mk @@ -19,7 +18,7 @@ JLLS = DSFMT GMP CURL LIBGIT2 LLVM LIBSSH2 LIBUV MBEDTLS MPFR NGHTTP2 \ BLASTRAMPOLINE OPENBLAS OPENLIBM P7ZIP PCRE LIBSUITESPARSE ZLIB \ LLVMUNWIND CSL UNWIND -# Initialize this with JLLs that aren't in deps/Versions.make +# Initialize this with JLLs that aren't in "deps/$(LibName).version" JLL_NAMES := MozillaCACerts_jll get-MozillaCACerts_jll: install-MozillaCACerts_jll: From 9e14d10f0e15732e15601280649c6501c921fc4b Mon Sep 17 00:00:00 2001 From: woclass Date: Thu, 16 Jun 2022 15:33:08 +0800 Subject: [PATCH 04/22] deps: include `$(LibName).version` --- deps/curl.mk | 1 + deps/dsfmt.mk | 1 + deps/gmp.mk | 1 + deps/libsuitesparse.mk | 1 + deps/mbedtls.mk | 1 + deps/mpfr.mk | 1 + deps/nghttp2.mk | 1 + deps/objconv.mk | 1 + deps/p7zip.mk | 1 + deps/patchelf.mk | 1 + deps/pcre.mk | 1 + deps/tools/bb-install.mk | 1 + deps/unwind.mk | 1 + 13 files changed, 13 insertions(+) diff --git a/deps/curl.mk b/deps/curl.mk index a7896c99b4669..3f90495c7c042 100644 --- a/deps/curl.mk +++ b/deps/curl.mk @@ -1,4 +1,5 @@ ## CURL ## +include $(SRCDIR)/curl.version ifeq ($(USE_SYSTEM_LIBSSH2), 0) $(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/libssh2 diff --git a/deps/dsfmt.mk b/deps/dsfmt.mk index 2300d0d5929f4..e5922187b0f0f 100644 --- a/deps/dsfmt.mk +++ b/deps/dsfmt.mk @@ -1,4 +1,5 @@ ## DSFMT ## +include $(SRCDIR)/dsfmt.version ifneq ($(USE_BINARYBUILDER_DSFMT),1) diff --git a/deps/gmp.mk b/deps/gmp.mk index 66ad92ac910ef..ccf76e12eef84 100644 --- a/deps/gmp.mk +++ b/deps/gmp.mk @@ -1,4 +1,5 @@ ## GMP ## +include $(SRCDIR)/gmp.version ifeq ($(SANITIZE),1) GMP_CONFIGURE_OPTS += --disable-assembly diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk index 1316a99a5b510..f62d07e18ef86 100644 --- a/deps/libsuitesparse.mk +++ b/deps/libsuitesparse.mk @@ -1,4 +1,5 @@ ## LIBSUITESPARSE ## +include $(SRCDIR)/libsuitesparse.version ifeq ($(USE_BLAS64), 1) UMFPACK_CONFIG := -DLONGBLAS='long long' diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk index 12788e1c03a1c..0f654dfd04c58 100644 --- a/deps/mbedtls.mk +++ b/deps/mbedtls.mk @@ -1,4 +1,5 @@ ## mbedtls +include $(SRCDIR)/mbedtls.version ifneq ($(USE_BINARYBUILDER_MBEDTLS), 1) MBEDTLS_SRC = mbedtls-$(MBEDTLS_VER) diff --git a/deps/mpfr.mk b/deps/mpfr.mk index 4598a319df6d5..1bb3ff32c302f 100644 --- a/deps/mpfr.mk +++ b/deps/mpfr.mk @@ -1,4 +1,5 @@ ## MPFR ## +include $(SRCDIR)/mpfr.version ifeq ($(USE_SYSTEM_GMP), 0) $(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured: | $(build_prefix)/manifest/gmp diff --git a/deps/nghttp2.mk b/deps/nghttp2.mk index 54fd6a241eaba..5c12a0155c017 100644 --- a/deps/nghttp2.mk +++ b/deps/nghttp2.mk @@ -1,4 +1,5 @@ ## nghttp2 +include $(SRCDIR)/nghttp2.version ifneq ($(USE_BINARYBUILDER_NGHTTP2), 1) diff --git a/deps/objconv.mk b/deps/objconv.mk index 8423e476d37c6..70c7289b07bfa 100644 --- a/deps/objconv.mk +++ b/deps/objconv.mk @@ -1,4 +1,5 @@ ## objconv ## +include $(SRCDIR)/objconv.version ifneq ($(USE_BINARYBUILDER_OBJCONV),1) diff --git a/deps/p7zip.mk b/deps/p7zip.mk index d1e9e653e123b..5fea4b63366c2 100644 --- a/deps/p7zip.mk +++ b/deps/p7zip.mk @@ -1,4 +1,5 @@ ## p7zip ## +include $(SRCDIR)/p7zip.version ifneq ($(USE_BINARYBUILDER_P7ZIP),1) diff --git a/deps/patchelf.mk b/deps/patchelf.mk index 4d1a281ed2331..9b4947f183117 100644 --- a/deps/patchelf.mk +++ b/deps/patchelf.mk @@ -1,4 +1,5 @@ ## patchelf ## +include $(SRCDIR)/patchelf.version $(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.bz2: | $(SRCCACHE) $(JLDOWNLOAD) $@ https://github.com/NixOS/patchelf/releases/download/$(PATCHELF_VER)/patchelf-$(PATCHELF_VER).tar.bz2 diff --git a/deps/pcre.mk b/deps/pcre.mk index eedb19faf5a57..5ff91b6bc44ac 100644 --- a/deps/pcre.mk +++ b/deps/pcre.mk @@ -1,4 +1,5 @@ ## PCRE ## +include $(SRCDIR)/pcre.version ifneq ($(USE_BINARYBUILDER_PCRE),1) # Force optimization for PCRE flags (Issue #11668) diff --git a/deps/tools/bb-install.mk b/deps/tools/bb-install.mk index 3b6ef327f944f..4077de0a1f484 100644 --- a/deps/tools/bb-install.mk +++ b/deps/tools/bb-install.mk @@ -5,6 +5,7 @@ # 4 cxx11) # signifies a cxx11 ABI dependency define bb-install +include $$(SRCDIR)/$1.version TRIPLET_VAR := BB_TRIPLET ifeq ($(3),true) TRIPLET_VAR := $$(TRIPLET_VAR)_LIBGFORTRAN diff --git a/deps/unwind.mk b/deps/unwind.mk index c6c15667f2432..39e48b193abb3 100644 --- a/deps/unwind.mk +++ b/deps/unwind.mk @@ -1,4 +1,5 @@ ## UNWIND ## +include $(SRCDIR)/unwind.version ifneq ($(USE_BINARYBUILDER_LIBUNWIND),1) LIBUNWIND_CFLAGS := -U_FORTIFY_SOURCE $(fPIC) -lz From 07c6f39e70810bbcd48eff68b368140d15824e09 Mon Sep 17 00:00:00 2001 From: woclass Date: Thu, 16 Jun 2022 15:42:29 +0800 Subject: [PATCH 05/22] deps: split `unwind.version`, add new `llvmunwind.version` --- deps/llvmunwind.version | 5 +++++ deps/unwind.mk | 1 + deps/unwind.version | 9 --------- 3 files changed, 6 insertions(+), 9 deletions(-) create mode 100644 deps/llvmunwind.version diff --git a/deps/llvmunwind.version b/deps/llvmunwind.version new file mode 100644 index 0000000000000..133712cd25b5a --- /dev/null +++ b/deps/llvmunwind.version @@ -0,0 +1,5 @@ +## jll artifact +LLVMUNWIND_JLL_NAME := LLVMLibUnwind + +## source build +LLVMUNWIND_VER := 12.0.1 diff --git a/deps/unwind.mk b/deps/unwind.mk index 39e48b193abb3..821f28d54ae07 100644 --- a/deps/unwind.mk +++ b/deps/unwind.mk @@ -1,5 +1,6 @@ ## UNWIND ## include $(SRCDIR)/unwind.version +include $(SRCDIR)/llvmunwind.version ifneq ($(USE_BINARYBUILDER_LIBUNWIND),1) LIBUNWIND_CFLAGS := -U_FORTIFY_SOURCE $(fPIC) -lz diff --git a/deps/unwind.version b/deps/unwind.version index c706e552fa248..e0f1e356adb6f 100644 --- a/deps/unwind.version +++ b/deps/unwind.version @@ -1,16 +1,7 @@ ## jll artifact -# LibUnwind UNWIND_JLL_NAME := LibUnwind UNWIND_JLL_VER := 1.5.0+1 -# LLVM libunwind -LLVMUNWIND_JLL_NAME := LLVMLibUnwind - - ## source build -# LibUnwind UNWIND_VER_TAG := 1.5 UNWIND_VER := 1.5.0 - -# LLVM libunwind -LLVMUNWIND_VER := 12.0.1 From 99a4538a88db1e979101681d87c6b396171bf92b Mon Sep 17 00:00:00 2001 From: woclass Date: Thu, 16 Jun 2022 15:44:09 +0800 Subject: [PATCH 06/22] deps: split `llvm.version` into `clang.version` + `llvm-tools.version` --- deps/clang.version | 4 ++++ deps/llvm-tools.version | 5 +++++ deps/llvm.version | 11 ----------- 3 files changed, 9 insertions(+), 11 deletions(-) create mode 100644 deps/clang.version create mode 100644 deps/llvm-tools.version diff --git a/deps/clang.version b/deps/clang.version new file mode 100644 index 0000000000000..cf23a334469f1 --- /dev/null +++ b/deps/clang.version @@ -0,0 +1,4 @@ +## jll artifact +# Clang (paired with LLVM, only here as a JLL download) +CLANG_JLL_NAME := Clang +CLANG_JLL_VER := 13.0.1+0 diff --git a/deps/llvm-tools.version b/deps/llvm-tools.version new file mode 100644 index 0000000000000..41d17856b152c --- /dev/null +++ b/deps/llvm-tools.version @@ -0,0 +1,5 @@ +## jll artifact +# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) +LLVM_TOOLS_JLL_NAME := LLVM +LLVM_TOOLS_JLL_VER := 13.0.1+0 +LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0 diff --git a/deps/llvm.version b/deps/llvm.version index c2c03b5344715..c6ed92a8006dd 100644 --- a/deps/llvm.version +++ b/deps/llvm.version @@ -1,18 +1,7 @@ ## jll artifact -# LLVM LLVM_JLL_NAME := libLLVM LLVM_ASSERT_JLL_VER := 13.0.1+0 -# Clang (paired with LLVM, only here as a JLL download) -CLANG_JLL_NAME := Clang -CLANG_JLL_VER := 13.0.1+0 - -# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) -LLVM_TOOLS_JLL_NAME := LLVM -LLVM_TOOLS_JLL_VER := 13.0.1+0 -LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0 - - ## source build LLVM_VER := 13.0.1 LLVM_BRANCH=julia-13.0.1-0 From c1c0910ce7e0310d202e9f6a6173365099ad0eb9 Mon Sep 17 00:00:00 2001 From: woclass Date: Thu, 16 Jun 2022 16:05:41 +0800 Subject: [PATCH 07/22] stdlib: Add new makefile `all_jlls.version` to include all `_jll` names --- stdlib/Makefile | 1 + stdlib/all_jlls.version | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 stdlib/all_jlls.version diff --git a/stdlib/Makefile b/stdlib/Makefile index 438815e9277cd..4f7b04b7416c5 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -6,6 +6,7 @@ SRCCACHE := $(abspath $(SRCDIR)/srccache) BUILDDIR := . include $(JULIAHOME)/Make.inc +include $(JULIAHOME)/stdlib/all_jlls.version include $(JULIAHOME)/deps/tools/common.mk include $(JULIAHOME)/deps/tools/stdlib-external.mk diff --git a/stdlib/all_jlls.version b/stdlib/all_jlls.version new file mode 100644 index 0000000000000..f5a32efb01c46 --- /dev/null +++ b/stdlib/all_jlls.version @@ -0,0 +1,28 @@ +## All `_jll` names and versions + +include $(JULIAHOME)/deps/blastrampoline.version +include $(JULIAHOME)/deps/clang.version +include $(JULIAHOME)/deps/csl.version +include $(JULIAHOME)/deps/curl.version +include $(JULIAHOME)/deps/dsfmt.version +include $(JULIAHOME)/deps/gmp.version +include $(JULIAHOME)/deps/libgit2.version +include $(JULIAHOME)/deps/libssh2.version +include $(JULIAHOME)/deps/libsuitesparse.version +include $(JULIAHOME)/deps/libuv.version +# include $(JULIAHOME)/deps/libwhich.version # no _jll pkg +include $(JULIAHOME)/deps/llvm.version +include $(JULIAHOME)/deps/llvm-tools.version +include $(JULIAHOME)/deps/llvmunwind.version +include $(JULIAHOME)/deps/mbedtls.version +include $(JULIAHOME)/deps/mpfr.version +include $(JULIAHOME)/deps/nghttp2.version +include $(JULIAHOME)/deps/objconv.version +include $(JULIAHOME)/deps/openblas.version +include $(JULIAHOME)/deps/openlibm.version +include $(JULIAHOME)/deps/p7zip.version +# include $(JULIAHOME)/deps/patchelf.version # no _jll pkg +include $(JULIAHOME)/deps/pcre.version +include $(JULIAHOME)/deps/unwind.version +# include $(JULIAHOME)/deps/utf8proc.version # no _jll pkg +include $(JULIAHOME)/deps/zlib.version From 2c12e0f3e8f22f6cf9eca3a1acb02b898fafcf59 Mon Sep 17 00:00:00 2001 From: woclass Date: Thu, 16 Jun 2022 16:18:28 +0800 Subject: [PATCH 08/22] Makefile: use `LF` for all makefiles --- deps/clang.version | 8 ++++---- deps/csl.version | 4 ++-- deps/curl.version | 10 +++++----- deps/dsfmt.version | 10 +++++----- deps/gmp.version | 10 +++++----- deps/libsuitesparse.version | 10 +++++----- deps/llvm-tools.version | 10 +++++----- deps/llvmunwind.version | 10 +++++----- deps/mbedtls.version | 10 +++++----- deps/mpfr.version | 10 +++++----- deps/nghttp2.version | 10 +++++----- deps/objconv.version | 14 +++++++------- deps/p7zip.version | 10 +++++----- deps/patchelf.version | 6 +++--- deps/pcre.version | 10 +++++----- deps/unwind.version | 14 +++++++------- 16 files changed, 78 insertions(+), 78 deletions(-) diff --git a/deps/clang.version b/deps/clang.version index cf23a334469f1..099b162f8cce9 100644 --- a/deps/clang.version +++ b/deps/clang.version @@ -1,4 +1,4 @@ -## jll artifact -# Clang (paired with LLVM, only here as a JLL download) -CLANG_JLL_NAME := Clang -CLANG_JLL_VER := 13.0.1+0 +## jll artifact +# Clang (paired with LLVM, only here as a JLL download) +CLANG_JLL_NAME := Clang +CLANG_JLL_VER := 13.0.1+0 diff --git a/deps/csl.version b/deps/csl.version index 74ce0a588d375..51af26c566c92 100644 --- a/deps/csl.version +++ b/deps/csl.version @@ -1,2 +1,2 @@ -## jll artifact -CSL_JLL_NAME := CompilerSupportLibraries +## jll artifact +CSL_JLL_NAME := CompilerSupportLibraries diff --git a/deps/curl.version b/deps/curl.version index d5f213faa59b1..65e60e16758f7 100644 --- a/deps/curl.version +++ b/deps/curl.version @@ -1,5 +1,5 @@ -## jll artifact -CURL_JLL_NAME := LibCURL - -## source build -CURL_VER := 7.83.1 +## jll artifact +CURL_JLL_NAME := LibCURL + +## source build +CURL_VER := 7.83.1 diff --git a/deps/dsfmt.version b/deps/dsfmt.version index 21ca57beefc20..bbb63417f46cd 100644 --- a/deps/dsfmt.version +++ b/deps/dsfmt.version @@ -1,5 +1,5 @@ -## jll artifact -DSFMT_JLL_NAME := dSFMT - -## source build -DSFMT_VER := 2.2.4 +## jll artifact +DSFMT_JLL_NAME := dSFMT + +## source build +DSFMT_VER := 2.2.4 diff --git a/deps/gmp.version b/deps/gmp.version index da6da2dae5d3f..f77cac5906cea 100644 --- a/deps/gmp.version +++ b/deps/gmp.version @@ -1,5 +1,5 @@ -## jll artifact -GMP_JLL_NAME := GMP - -## source build -GMP_VER := 6.2.1 +## jll artifact +GMP_JLL_NAME := GMP + +## source build +GMP_VER := 6.2.1 diff --git a/deps/libsuitesparse.version b/deps/libsuitesparse.version index 18f74eae5d815..2237db6f2d116 100644 --- a/deps/libsuitesparse.version +++ b/deps/libsuitesparse.version @@ -1,5 +1,5 @@ -## jll artifact -LIBSUITESPARSE_JLL_NAME := SuiteSparse - -## source build -LIBSUITESPARSE_VER := 5.10.1 +## jll artifact +LIBSUITESPARSE_JLL_NAME := SuiteSparse + +## source build +LIBSUITESPARSE_VER := 5.10.1 diff --git a/deps/llvm-tools.version b/deps/llvm-tools.version index 41d17856b152c..72bda26c92c9b 100644 --- a/deps/llvm-tools.version +++ b/deps/llvm-tools.version @@ -1,5 +1,5 @@ -## jll artifact -# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) -LLVM_TOOLS_JLL_NAME := LLVM -LLVM_TOOLS_JLL_VER := 13.0.1+0 -LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0 +## jll artifact +# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) +LLVM_TOOLS_JLL_NAME := LLVM +LLVM_TOOLS_JLL_VER := 13.0.1+0 +LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0 diff --git a/deps/llvmunwind.version b/deps/llvmunwind.version index 133712cd25b5a..7d13af9a158f7 100644 --- a/deps/llvmunwind.version +++ b/deps/llvmunwind.version @@ -1,5 +1,5 @@ -## jll artifact -LLVMUNWIND_JLL_NAME := LLVMLibUnwind - -## source build -LLVMUNWIND_VER := 12.0.1 +## jll artifact +LLVMUNWIND_JLL_NAME := LLVMLibUnwind + +## source build +LLVMUNWIND_VER := 12.0.1 diff --git a/deps/mbedtls.version b/deps/mbedtls.version index 3814047352039..eaf3bca011e1f 100644 --- a/deps/mbedtls.version +++ b/deps/mbedtls.version @@ -1,5 +1,5 @@ -## jll artifact -MBEDTLS_JLL_NAME := MbedTLS - -## source build -MBEDTLS_VER := 2.28.0 +## jll artifact +MBEDTLS_JLL_NAME := MbedTLS + +## source build +MBEDTLS_VER := 2.28.0 diff --git a/deps/mpfr.version b/deps/mpfr.version index 1a06213a70a63..d3fe3a1a62d61 100644 --- a/deps/mpfr.version +++ b/deps/mpfr.version @@ -1,5 +1,5 @@ -## jll artifact -MPFR_JLL_NAME := MPFR - -## source build -MPFR_VER := 4.1.0 +## jll artifact +MPFR_JLL_NAME := MPFR + +## source build +MPFR_VER := 4.1.0 diff --git a/deps/nghttp2.version b/deps/nghttp2.version index b885a2c1266b5..da553fa6ee7fc 100644 --- a/deps/nghttp2.version +++ b/deps/nghttp2.version @@ -1,5 +1,5 @@ -## jll artifact -NGHTTP2_JLL_NAME := nghttp2 - -## source build -NGHTTP2_VER := 1.47.0 +## jll artifact +NGHTTP2_JLL_NAME := nghttp2 + +## source build +NGHTTP2_VER := 1.47.0 diff --git a/deps/objconv.version b/deps/objconv.version index ab7c43a33af91..26c410f14730d 100644 --- a/deps/objconv.version +++ b/deps/objconv.version @@ -1,7 +1,7 @@ -## jll artifact -# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here) -OBJCONV_JLL_NAME := Objconv -OBJCONV_JLL_VER := 2.49.1+0 - -## source build -OBJCONV_VER := 2.49.1 +## jll artifact +# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here) +OBJCONV_JLL_NAME := Objconv +OBJCONV_JLL_VER := 2.49.1+0 + +## source build +OBJCONV_VER := 2.49.1 diff --git a/deps/p7zip.version b/deps/p7zip.version index b43840034bc7e..d4a13155d9162 100644 --- a/deps/p7zip.version +++ b/deps/p7zip.version @@ -1,5 +1,5 @@ -## jll artifact -P7ZIP_JLL_NAME := p7zip - -## source build -P7ZIP_VER := 17.04 +## jll artifact +P7ZIP_JLL_NAME := p7zip + +## source build +P7ZIP_VER := 17.04 diff --git a/deps/patchelf.version b/deps/patchelf.version index 3f9417e564b15..bbeaa87d25136 100644 --- a/deps/patchelf.version +++ b/deps/patchelf.version @@ -1,3 +1,3 @@ -## source build -# Patchelf (we don't ship this or even use a JLL, we just always build it) -PATCHELF_VER := 0.13 +## source build +# Patchelf (we don't ship this or even use a JLL, we just always build it) +PATCHELF_VER := 0.13 diff --git a/deps/pcre.version b/deps/pcre.version index f31b254370e6c..522c6a5605514 100644 --- a/deps/pcre.version +++ b/deps/pcre.version @@ -1,5 +1,5 @@ -## jll artifact -PCRE_JLL_NAME := PCRE2 - -## source build -PCRE_VER := 10.40 +## jll artifact +PCRE_JLL_NAME := PCRE2 + +## source build +PCRE_VER := 10.40 diff --git a/deps/unwind.version b/deps/unwind.version index e0f1e356adb6f..2f2460fdb8d47 100644 --- a/deps/unwind.version +++ b/deps/unwind.version @@ -1,7 +1,7 @@ -## jll artifact -UNWIND_JLL_NAME := LibUnwind -UNWIND_JLL_VER := 1.5.0+1 - -## source build -UNWIND_VER_TAG := 1.5 -UNWIND_VER := 1.5.0 +## jll artifact +UNWIND_JLL_NAME := LibUnwind +UNWIND_JLL_VER := 1.5.0+1 + +## source build +UNWIND_VER_TAG := 1.5 +UNWIND_VER := 1.5.0 From 0d727d4dadd7e9805f121f14f427cc1e2c1a957a Mon Sep 17 00:00:00 2001 From: woclass Date: Fri, 17 Jun 2022 16:18:34 +0800 Subject: [PATCH 09/22] deps/llvm: include `llvm.version` load `LLVM_ASSERT_JLL_VER` (Line290) before `bb-install` --- deps/llvm.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/deps/llvm.mk b/deps/llvm.mk index e0512137da924..7a83d720cb40e 100644 --- a/deps/llvm.mk +++ b/deps/llvm.mk @@ -1,6 +1,7 @@ ## LLVM ## include $(SRCDIR)/llvm-ver.make include $(SRCDIR)/llvm-options.mk +include $(SRCDIR)/llvm.version ifneq ($(USE_BINARYBUILDER_LLVM), 1) LLVM_GIT_URL:=https://github.com/JuliaLang/llvm-project.git From 1850865b14cdac4c2ddc8884ff87e64ea95799fc Mon Sep 17 00:00:00 2001 From: woclass Date: Sat, 18 Jun 2022 02:00:16 +0800 Subject: [PATCH 10/22] deps/llvm: adjust include sequence, include `.version` first --- deps/llvm.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/llvm.mk b/deps/llvm.mk index 7a83d720cb40e..94dd4ad198568 100644 --- a/deps/llvm.mk +++ b/deps/llvm.mk @@ -1,7 +1,7 @@ ## LLVM ## +include $(SRCDIR)/llvm.version include $(SRCDIR)/llvm-ver.make include $(SRCDIR)/llvm-options.mk -include $(SRCDIR)/llvm.version ifneq ($(USE_BINARYBUILDER_LLVM), 1) LLVM_GIT_URL:=https://github.com/JuliaLang/llvm-project.git From 809a97ff25e6ac723d3e523d7605074822e3e35b Mon Sep 17 00:00:00 2001 From: woclass Date: Sat, 18 Jun 2022 18:33:04 +0800 Subject: [PATCH 11/22] deps/llvm: update to 14.0.2 xref: #45679 --- deps/clang.version | 2 +- deps/lld.version | 3 +++ deps/llvm-tools.version | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 deps/lld.version diff --git a/deps/clang.version b/deps/clang.version index 099b162f8cce9..48b552c5996d7 100644 --- a/deps/clang.version +++ b/deps/clang.version @@ -1,4 +1,4 @@ ## jll artifact # Clang (paired with LLVM, only here as a JLL download) CLANG_JLL_NAME := Clang -CLANG_JLL_VER := 13.0.1+0 +CLANG_JLL_VER := 14.0.2+1 diff --git a/deps/lld.version b/deps/lld.version new file mode 100644 index 0000000000000..143b0f316f174 --- /dev/null +++ b/deps/lld.version @@ -0,0 +1,3 @@ +## jll artifact +LLD_JLL_NAME := LLD +LLD_JLL_VER := 14.0.2+1 diff --git a/deps/llvm-tools.version b/deps/llvm-tools.version index 72bda26c92c9b..4780b68cbc8b5 100644 --- a/deps/llvm-tools.version +++ b/deps/llvm-tools.version @@ -1,5 +1,5 @@ ## jll artifact # LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) LLVM_TOOLS_JLL_NAME := LLVM -LLVM_TOOLS_JLL_VER := 13.0.1+0 -LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0 +LLVM_TOOLS_JLL_VER := 14.0.2+1 +LLVM_TOOLS_ASSERT_JLL_VER := 14.0.2+1 \ No newline at end of file From badc75d16aa97717b255aa14b512a66dcea25f74 Mon Sep 17 00:00:00 2001 From: woclass Date: Sat, 18 Jun 2022 19:05:33 +0800 Subject: [PATCH 12/22] Update deps/unwind.version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mosè Giordano --- deps/unwind.version | 1 - 1 file changed, 1 deletion(-) diff --git a/deps/unwind.version b/deps/unwind.version index 2f2460fdb8d47..e17b2e91c2e51 100644 --- a/deps/unwind.version +++ b/deps/unwind.version @@ -1,6 +1,5 @@ ## jll artifact UNWIND_JLL_NAME := LibUnwind -UNWIND_JLL_VER := 1.5.0+1 ## source build UNWIND_VER_TAG := 1.5 From bae11d82db8778cebde713ec1a7749f7d8f19cab Mon Sep 17 00:00:00 2001 From: woclass Date: Sat, 18 Jun 2022 19:51:21 +0800 Subject: [PATCH 13/22] deps/LibUnwind_jll: fix version mismatch (`Project.toml` and `checksum`) xref: #42782 --- stdlib/LibUnwind_jll/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/LibUnwind_jll/Project.toml b/stdlib/LibUnwind_jll/Project.toml index e22105ddacd47..d56772089bae4 100644 --- a/stdlib/LibUnwind_jll/Project.toml +++ b/stdlib/LibUnwind_jll/Project.toml @@ -1,6 +1,6 @@ name = "LibUnwind_jll" uuid = "745a5e78-f969-53e9-954f-d19f2f74f4e3" -version = "1.5.0+0" +version = "1.5.0+1" [deps] Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" From 90b6055b305fb5f587b7f3f9418230b5e3bacad2 Mon Sep 17 00:00:00 2001 From: woclass Date: Sat, 18 Jun 2022 19:51:41 +0800 Subject: [PATCH 14/22] Update deps/llvm-tools.version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mosè Giordano --- deps/llvm-tools.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/llvm-tools.version b/deps/llvm-tools.version index 4780b68cbc8b5..0885763ef636b 100644 --- a/deps/llvm-tools.version +++ b/deps/llvm-tools.version @@ -2,4 +2,4 @@ # LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) LLVM_TOOLS_JLL_NAME := LLVM LLVM_TOOLS_JLL_VER := 14.0.2+1 -LLVM_TOOLS_ASSERT_JLL_VER := 14.0.2+1 \ No newline at end of file +LLVM_TOOLS_ASSERT_JLL_VER := 14.0.2+1 From fd42fe30a2e20e979ac95788930208ddf0473868 Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Sun, 19 Jun 2022 16:11:37 -0400 Subject: [PATCH 15/22] Update OPENBLAS_VER to 0.3.20 --- deps/openblas.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/openblas.version b/deps/openblas.version index 2c73c5c2ef441..843bb449c92c7 100644 --- a/deps/openblas.version +++ b/deps/openblas.version @@ -2,7 +2,7 @@ OPENBLAS_JLL_NAME := OpenBLAS ## source build -OPENBLAS_VER := 0.3.17 +OPENBLAS_VER := 0.3.20 OPENBLAS_BRANCH=v0.3.20 OPENBLAS_SHA1=0b678b19dc03f2a999d6e038814c4c50b9640a4e From 3e4ffb0e4d31256ae3e059d05173632f48edae00 Mon Sep 17 00:00:00 2001 From: woclass Date: Mon, 20 Jun 2022 11:03:29 +0800 Subject: [PATCH 16/22] deps: merge patches for `Versions.make` xref: #45746 --- deps/blastrampoline.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/blastrampoline.version b/deps/blastrampoline.version index 3c8e26c43c8d8..7a153431bafbe 100644 --- a/deps/blastrampoline.version +++ b/deps/blastrampoline.version @@ -2,6 +2,6 @@ BLASTRAMPOLINE_JLL_NAME := libblastrampoline ## source build -BLASTRAMPOLINE_VER := 5.1.0 +BLASTRAMPOLINE_VER := 5.1.1 BLASTRAMPOLINE_BRANCH=v5.1.1 BLASTRAMPOLINE_SHA1=bac2f810d523003fbb431ecc6e9ea81c8b86e2d6 From 5051246a8925ac481a290958533b78b303197737 Mon Sep 17 00:00:00 2001 From: woclass Date: Mon, 20 Jun 2022 11:04:31 +0800 Subject: [PATCH 17/22] Update stdlib/all_jlls.version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mosè Giordano --- stdlib/all_jlls.version | 1 + 1 file changed, 1 insertion(+) diff --git a/stdlib/all_jlls.version b/stdlib/all_jlls.version index f5a32efb01c46..d09777b0470e6 100644 --- a/stdlib/all_jlls.version +++ b/stdlib/all_jlls.version @@ -1,3 +1,4 @@ +# -*- mode: make -*- ## All `_jll` names and versions include $(JULIAHOME)/deps/blastrampoline.version From 9e15c308fba2c27d808864d985a89902c1254d7f Mon Sep 17 00:00:00 2001 From: woclass Date: Mon, 20 Jun 2022 11:12:13 +0800 Subject: [PATCH 18/22] deps/mpfr: add comments for version mismatch --- deps/mpfr.version | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deps/mpfr.version b/deps/mpfr.version index d3fe3a1a62d61..63fed0f8504f4 100644 --- a/deps/mpfr.version +++ b/deps/mpfr.version @@ -3,3 +3,7 @@ MPFR_JLL_NAME := MPFR ## source build MPFR_VER := 4.1.0 + +# Note: jll use a different version `4.1.1+1` ("stdlib/MPFR_jll/Project.toml") +# See notes in build_tarballs.jl +# https://github.com/JuliaPackaging/Yggdrasil/blob/3c877e18dd9bb9b2e79415e00f661a7e37b2aea9/M/MPFR/build_tarballs.jl#L40-L42 From 212eab62736f8cf4a9ac845837c9c621caf28903 Mon Sep 17 00:00:00 2001 From: woclass Date: Tue, 21 Jun 2022 10:00:50 +0800 Subject: [PATCH 19/22] Update deps/objconv.version Co-authored-by: Elliot Saba --- deps/objconv.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/objconv.version b/deps/objconv.version index 26c410f14730d..322c8fa828a17 100644 --- a/deps/objconv.version +++ b/deps/objconv.version @@ -1,5 +1,5 @@ ## jll artifact -# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here) +# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here instead of in a `stdlib/Objconv_jll/Project.toml` file) OBJCONV_JLL_NAME := Objconv OBJCONV_JLL_VER := 2.49.1+0 From 6d0106413f4de7198d7bd3df8dec2f411d439671 Mon Sep 17 00:00:00 2001 From: woclass Date: Tue, 21 Jun 2022 10:00:58 +0800 Subject: [PATCH 20/22] Update stdlib/all_jlls.version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mosè Giordano --- stdlib/all_jlls.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/all_jlls.version b/stdlib/all_jlls.version index d09777b0470e6..3572782e290aa 100644 --- a/stdlib/all_jlls.version +++ b/stdlib/all_jlls.version @@ -1,4 +1,4 @@ -# -*- mode: make -*- +# -*- mode: makefile -*- ## All `_jll` names and versions include $(JULIAHOME)/deps/blastrampoline.version From 9e7b058f116b35f50c947ccb565773c2400e040c Mon Sep 17 00:00:00 2001 From: woclass Date: Tue, 21 Jun 2022 10:13:19 +0800 Subject: [PATCH 21/22] deps: add a TODO in `all_jlls.version` --- stdlib/all_jlls.version | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stdlib/all_jlls.version b/stdlib/all_jlls.version index d09777b0470e6..1b02652f7e18f 100644 --- a/stdlib/all_jlls.version +++ b/stdlib/all_jlls.version @@ -1,6 +1,8 @@ # -*- mode: make -*- ## All `_jll` names and versions +## TODO: Automatic include of all `*.version` makefile + include $(JULIAHOME)/deps/blastrampoline.version include $(JULIAHOME)/deps/clang.version include $(JULIAHOME)/deps/csl.version From fd69fab1ae258997bcfeaef160a0683e32f65615 Mon Sep 17 00:00:00 2001 From: woclass Date: Wed, 22 Jun 2022 19:09:09 +0800 Subject: [PATCH 22/22] deps: apply patches from `deps/Versions.make` ref: #45761 --- deps/clang.version | 2 +- deps/lld.version | 2 +- deps/llvm-tools.version | 4 ++-- deps/llvm.version | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deps/clang.version b/deps/clang.version index 48b552c5996d7..c95cdeaf64787 100644 --- a/deps/clang.version +++ b/deps/clang.version @@ -1,4 +1,4 @@ ## jll artifact # Clang (paired with LLVM, only here as a JLL download) CLANG_JLL_NAME := Clang -CLANG_JLL_VER := 14.0.2+1 +CLANG_JLL_VER := 14.0.5+0 diff --git a/deps/lld.version b/deps/lld.version index 143b0f316f174..a365bdbbc289e 100644 --- a/deps/lld.version +++ b/deps/lld.version @@ -1,3 +1,3 @@ ## jll artifact LLD_JLL_NAME := LLD -LLD_JLL_VER := 14.0.2+1 +LLD_JLL_VER := 14.0.5+0 diff --git a/deps/llvm-tools.version b/deps/llvm-tools.version index 0885763ef636b..5bc9fc87d84ed 100644 --- a/deps/llvm-tools.version +++ b/deps/llvm-tools.version @@ -1,5 +1,5 @@ ## jll artifact # LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`) LLVM_TOOLS_JLL_NAME := LLVM -LLVM_TOOLS_JLL_VER := 14.0.2+1 -LLVM_TOOLS_ASSERT_JLL_VER := 14.0.2+1 +LLVM_TOOLS_JLL_VER := 14.0.5+0 +LLVM_TOOLS_ASSERT_JLL_VER := 14.0.5+0 diff --git a/deps/llvm.version b/deps/llvm.version index 2edf9ef5f8982..e385008826e88 100644 --- a/deps/llvm.version +++ b/deps/llvm.version @@ -1,6 +1,6 @@ ## jll artifact LLVM_JLL_NAME := libLLVM -LLVM_ASSERT_JLL_VER := 14.0.2+1 +LLVM_ASSERT_JLL_VER := 14.0.5+0 ## source build LLVM_VER := 14.0.2