From bd7bd5e4af7f2ecc7caf98c787484ff99c1e95df Mon Sep 17 00:00:00 2001 From: woclass Date: Fri, 1 Jul 2022 05:08:08 +0800 Subject: [PATCH] [stdlib/jll] Automatic include of all `*.version` makefile (#45851) * [stdlib/jll] rm `all_jlls.version` --- stdlib/Makefile | 5 ++++- stdlib/all_jlls.version | 31 ------------------------------- 2 files changed, 4 insertions(+), 32 deletions(-) delete mode 100644 stdlib/all_jlls.version diff --git a/stdlib/Makefile b/stdlib/Makefile index 4f7b04b7416c5..5a72290ce96f0 100644 --- a/stdlib/Makefile +++ b/stdlib/Makefile @@ -6,9 +6,12 @@ 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 +# include all `*.version` files, import `LIBNAME_JLL_NAME` and `LIBNAME_JLL_VER` +# Note: Some deps do not have a `_jll` pkg: [libwhich, patchelf, utf8proc] +include $(JULIAHOME)/deps/*.version + VERSDIR := v$(shell cut -d. -f1-2 < $(JULIAHOME)/VERSION) diff --git a/stdlib/all_jlls.version b/stdlib/all_jlls.version deleted file mode 100644 index 5d869a7798a86..0000000000000 --- a/stdlib/all_jlls.version +++ /dev/null @@ -1,31 +0,0 @@ -# -*- mode: makefile -*- -## 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 -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