[stdlib/jll] Automatic include of all *.version makefile (JuliaLang…

…#45851) * [stdlib/jll] rm `all_jlls.version`
baggepinnen · Jun 30, 2022 · bd7bd5e · bd7bd5e
1 parent 9e3bd48
commit bd7bd5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 32 deletions.
diff --git 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