From 14ca2275fd27315c9e026ef254dd88e071395715 Mon Sep 17 00:00:00 2001 From: jlbuild Date: Wed, 4 Dec 2019 22:04:18 +0000 Subject: [PATCH] HDF5_jll build 1.10.5+1 --- Artifacts.toml | 44 +++++++++++++-------------- Project.toml | 4 +-- src/HDF5_jll.jl | 19 ++++++++++++ src/wrappers/i686-linux-gnu.jl | 35 ++++++++++++++++++--- src/wrappers/i686-w64-mingw32.jl | 35 ++++++++++++++++++--- src/wrappers/x86_64-apple-darwin14.jl | 35 ++++++++++++++++++--- src/wrappers/x86_64-linux-gnu.jl | 35 ++++++++++++++++++--- src/wrappers/x86_64-w64-mingw32.jl | 35 ++++++++++++++++++--- 8 files changed, 193 insertions(+), 49 deletions(-) diff --git a/Artifacts.toml b/Artifacts.toml index 888c4dc..4e755f3 100644 --- a/Artifacts.toml +++ b/Artifacts.toml @@ -1,42 +1,42 @@ [[HDF5]] -arch = "i686" -git-tree-sha1 = "100555f5c073af801758d7ef6dcdbf0c7d17ef09" +arch = "x86_64" +git-tree-sha1 = "76c7a3dd3168106a6cd35b145d06d643a30e56fe" libc = "glibc" os = "linux" [[HDF5.download]] - sha256 = "1d78a51459f4c70a8627bec6c3a5f9c785dc083b4f965cd9dadd4863f86826b7" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+0/HDF5.v1.10.5.i686-linux-gnu.tar.gz" + sha256 = "631117ec2bb9c6c756e80592195d9046ccbb206616f0ffb44237101a81b09f42" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+1/HDF5.v1.10.5.x86_64-linux-gnu.tar.gz" [[HDF5]] arch = "x86_64" -git-tree-sha1 = "0bad13f574151fc8cebbc479d54af629dc5a9d11" -libc = "glibc" -os = "linux" +git-tree-sha1 = "2ca9f77307bd9986fd6519d2f328a6c6b0219e37" +os = "windows" [[HDF5.download]] - sha256 = "82979002b85c0f9a1325d2aa6d02182ea8f6114b5719dbb056527afb075379eb" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+0/HDF5.v1.10.5.x86_64-linux-gnu.tar.gz" + sha256 = "cf9ef9c909972f76463063c9c8f289a88a27d72920f2c9a6722c0c38ae719088" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+1/HDF5.v1.10.5.x86_64-w64-mingw32.tar.gz" [[HDF5]] -arch = "x86_64" -git-tree-sha1 = "c0469fb20beb3bc8277a88da8472b436508fc5ec" -os = "macos" +arch = "i686" +git-tree-sha1 = "29fa6da8ecf3cfb522e901b86e6942b08e373eec" +os = "windows" [[HDF5.download]] - sha256 = "924a29bfaf0cc2c9f01fae6cd86cba2b66c92406d6d4bbe6fa6a12bc643fea96" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+0/HDF5.v1.10.5.x86_64-apple-darwin14.tar.gz" + sha256 = "554512782b817a9d87d201f1f2d8f4b02f4ec0af70e4e1a197791741ca95201e" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+1/HDF5.v1.10.5.i686-w64-mingw32.tar.gz" [[HDF5]] arch = "x86_64" -git-tree-sha1 = "cfdebac7c1584f1ee48dce1f9da622daa6d028f4" -os = "windows" +git-tree-sha1 = "0dde930a1715703cde65bc5e14bec348e95c2ffd" +os = "macos" [[HDF5.download]] - sha256 = "6f00f61cbba96be2f993ffa1da3f3c354b8747cced85f6696b00ddc72b9a8ad6" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+0/HDF5.v1.10.5.x86_64-w64-mingw32.tar.gz" + sha256 = "77ec78ae956a0d489864f9317ddcc912300b41bb3bbbfb6fc7d51b7d7731a7e9" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+1/HDF5.v1.10.5.x86_64-apple-darwin14.tar.gz" [[HDF5]] arch = "i686" -git-tree-sha1 = "f6bed2e41f3024dc4ed751d649c012a75e4b4f6a" -os = "windows" +git-tree-sha1 = "fed8d8e020181bbcd1f9130731404e9f1c630550" +libc = "glibc" +os = "linux" [[HDF5.download]] - sha256 = "817ecdc8168f1579b2fc9f844e74e52b7ae18579f0e412c43d7c4ae204decb6f" - url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+0/HDF5.v1.10.5.i686-w64-mingw32.tar.gz" + sha256 = "d4b58ad68330716518d563c852a35815ca02545eb39a38aac100bc5954094ecd" + url = "https://github.com/JuliaBinaryWrappers/HDF5_jll.jl/releases/download/HDF5-v1.10.5+1/HDF5.v1.10.5.i686-linux-gnu.tar.gz" diff --git a/Project.toml b/Project.toml index 0714680..3c10a66 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "HDF5_jll" uuid = "0234f1f7-429e-5d53-9886-15a909be8d59" -version = "1.10.5+0" +version = "1.10.5+1" [deps] Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" @@ -8,4 +8,4 @@ Zlib_jll = "83775a58-1f1d-513f-b197-d71354ab007a" Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb" [compat] -julia = "1.3" +julia = "1.0" diff --git a/src/HDF5_jll.jl b/src/HDF5_jll.jl index 3486cd8..60bcca9 100644 --- a/src/HDF5_jll.jl +++ b/src/HDF5_jll.jl @@ -1,4 +1,23 @@ module HDF5_jll + +if VERSION < v"1.3.0-rc4" + # We lie a bit in the registry that JLL packages are usable on Julia 1.0-1.2. + # This is to allow packages that might want to support Julia 1.0 to get the + # benefits of a JLL package on 1.3 (requiring them to declare a dependence on + # this JLL package in their Project.toml) but engage in heroic hacks to do + # something other than actually use a JLL package on 1.0-1.2. By allowing + # this package to be installed (but not loaded) on 1.0-1.2, we enable users + # to avoid splitting their package versions into pre-1.3 and post-1.3 branches + # if they are willing to engage in the kinds of hoop-jumping they might need + # to in order to install binaries in a JLL-compatible way on 1.0-1.2. One + # example of this hoop-jumping being to express a dependency on this JLL + # package, then import it wtihin a `VERSION >= v"1.3"` conditional, and use + # the deprecated `build.jl` mechanism to download the binaries through e.g. + # `BinaryProvider.jl`. This should work well for the simplest packages, and + # require greater and greater heroics for more and more complex packages. + error("Unable to import HDF5_jll on Julia versions older than 1.3!") +end + using Pkg, Pkg.BinaryPlatforms, Pkg.Artifacts, Libdl import Base: UUID diff --git a/src/wrappers/i686-linux-gnu.jl b/src/wrappers/i686-linux-gnu.jl index 737db86..b4fe828 100644 --- a/src/wrappers/i686-linux-gnu.jl +++ b/src/wrappers/i686-linux-gnu.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for i686-linux-gnu -export libhdf5 +export libhdf5_hl, libhdf5 using Zlib_jll ## Global variables @@ -7,6 +7,20 @@ PATH = "" LIBPATH = "" LIBPATH_env = "LD_LIBRARY_PATH" +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.so.100.1.1"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_hl_path = "" + +# libhdf5_hl-specific global declaration +# This will be filled out by __init__() +libhdf5_hl_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5_hl = "libhdf5_hl-3aef14e1.so.100.1.1" + + # Relative path to `libhdf5` const libhdf5_splitpath = ["lib", "libhdf5.so.103.0.0"] @@ -25,14 +39,25 @@ const libhdf5 = "libhdf5-ad97bb1b.so.103.0.0" Open all libraries """ function __init__() - global prefix = abspath(joinpath(@__DIR__, "..")) + global artifact_dir = abspath(artifact"HDF5") # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - append!.(Ref(PATH_list), (Zlib_jll.PATH_list,)) - append!.(Ref(LIBPATH_list), (Zlib_jll.LIBPATH_list,)) + # We first need to add to LIBPATH_list the libraries provided by Julia + append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) + # From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists, + # then append them to our own. + foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) + foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) + + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) - global libhdf5_path = abspath(joinpath(artifact"HDF5", libhdf5_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. diff --git a/src/wrappers/i686-w64-mingw32.jl b/src/wrappers/i686-w64-mingw32.jl index d298279..c8a1297 100644 --- a/src/wrappers/i686-w64-mingw32.jl +++ b/src/wrappers/i686-w64-mingw32.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for i686-w64-mingw32 -export libhdf5 +export libhdf5_hl, libhdf5 using Zlib_jll ## Global variables @@ -7,6 +7,20 @@ PATH = "" LIBPATH = "" LIBPATH_env = "PATH" +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["bin", "libhdf5_hl-0.dll"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_hl_path = "" + +# libhdf5_hl-specific global declaration +# This will be filled out by __init__() +libhdf5_hl_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5_hl = "libhdf5_hl-0.dll" + + # Relative path to `libhdf5` const libhdf5_splitpath = ["bin", "libhdf5-0.dll"] @@ -25,14 +39,25 @@ const libhdf5 = "libhdf5-0.dll" Open all libraries """ function __init__() - global prefix = abspath(joinpath(@__DIR__, "..")) + global artifact_dir = abspath(artifact"HDF5") # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - append!.(Ref(PATH_list), (Zlib_jll.PATH_list,)) - append!.(Ref(LIBPATH_list), (Zlib_jll.LIBPATH_list,)) + # We first need to add to LIBPATH_list the libraries provided by Julia + append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) + # From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists, + # then append them to our own. + foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) + foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) + + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) - global libhdf5_path = abspath(joinpath(artifact"HDF5", libhdf5_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. diff --git a/src/wrappers/x86_64-apple-darwin14.jl b/src/wrappers/x86_64-apple-darwin14.jl index e8e4450..5b7a34b 100644 --- a/src/wrappers/x86_64-apple-darwin14.jl +++ b/src/wrappers/x86_64-apple-darwin14.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for x86_64-apple-darwin14 -export libhdf5 +export libhdf5_hl, libhdf5 using Zlib_jll ## Global variables @@ -7,6 +7,20 @@ PATH = "" LIBPATH = "" LIBPATH_env = "DYLD_FALLBACK_LIBRARY_PATH" +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.100.dylib"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_hl_path = "" + +# libhdf5_hl-specific global declaration +# This will be filled out by __init__() +libhdf5_hl_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5_hl = "libhdf5_hl.100.dylib" + + # Relative path to `libhdf5` const libhdf5_splitpath = ["lib", "libhdf5.103.dylib"] @@ -25,14 +39,25 @@ const libhdf5 = "libhdf5.103.dylib" Open all libraries """ function __init__() - global prefix = abspath(joinpath(@__DIR__, "..")) + global artifact_dir = abspath(artifact"HDF5") # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - append!.(Ref(PATH_list), (Zlib_jll.PATH_list,)) - append!.(Ref(LIBPATH_list), (Zlib_jll.LIBPATH_list,)) + # We first need to add to LIBPATH_list the libraries provided by Julia + append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) + # From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists, + # then append them to our own. + foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) + foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) + + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) - global libhdf5_path = abspath(joinpath(artifact"HDF5", libhdf5_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. diff --git a/src/wrappers/x86_64-linux-gnu.jl b/src/wrappers/x86_64-linux-gnu.jl index 6f3d709..f5b57a9 100644 --- a/src/wrappers/x86_64-linux-gnu.jl +++ b/src/wrappers/x86_64-linux-gnu.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for x86_64-linux-gnu -export libhdf5 +export libhdf5_hl, libhdf5 using Zlib_jll ## Global variables @@ -7,6 +7,20 @@ PATH = "" LIBPATH = "" LIBPATH_env = "LD_LIBRARY_PATH" +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["lib", "libhdf5_hl.so.100.1.1"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_hl_path = "" + +# libhdf5_hl-specific global declaration +# This will be filled out by __init__() +libhdf5_hl_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5_hl = "libhdf5_hl-db841637.so.100.1.1" + + # Relative path to `libhdf5` const libhdf5_splitpath = ["lib", "libhdf5.so.103.0.0"] @@ -25,14 +39,25 @@ const libhdf5 = "libhdf5-49c0b88d.so.103.0.0" Open all libraries """ function __init__() - global prefix = abspath(joinpath(@__DIR__, "..")) + global artifact_dir = abspath(artifact"HDF5") # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - append!.(Ref(PATH_list), (Zlib_jll.PATH_list,)) - append!.(Ref(LIBPATH_list), (Zlib_jll.LIBPATH_list,)) + # We first need to add to LIBPATH_list the libraries provided by Julia + append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) + # From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists, + # then append them to our own. + foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) + foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) + + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) - global libhdf5_path = abspath(joinpath(artifact"HDF5", libhdf5_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately. diff --git a/src/wrappers/x86_64-w64-mingw32.jl b/src/wrappers/x86_64-w64-mingw32.jl index 028535f..cecc448 100644 --- a/src/wrappers/x86_64-w64-mingw32.jl +++ b/src/wrappers/x86_64-w64-mingw32.jl @@ -1,5 +1,5 @@ # Autogenerated wrapper script for HDF5_jll for x86_64-w64-mingw32 -export libhdf5 +export libhdf5_hl, libhdf5 using Zlib_jll ## Global variables @@ -7,6 +7,20 @@ PATH = "" LIBPATH = "" LIBPATH_env = "PATH" +# Relative path to `libhdf5_hl` +const libhdf5_hl_splitpath = ["bin", "libhdf5_hl-0.dll"] + +# This will be filled out by __init__() for all products, as it must be done at runtime +libhdf5_hl_path = "" + +# libhdf5_hl-specific global declaration +# This will be filled out by __init__() +libhdf5_hl_handle = C_NULL + +# This must be `const` so that we can use it with `ccall()` +const libhdf5_hl = "libhdf5_hl-0.dll" + + # Relative path to `libhdf5` const libhdf5_splitpath = ["bin", "libhdf5-0.dll"] @@ -25,14 +39,25 @@ const libhdf5 = "libhdf5-0.dll" Open all libraries """ function __init__() - global prefix = abspath(joinpath(@__DIR__, "..")) + global artifact_dir = abspath(artifact"HDF5") # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - append!.(Ref(PATH_list), (Zlib_jll.PATH_list,)) - append!.(Ref(LIBPATH_list), (Zlib_jll.LIBPATH_list,)) + # We first need to add to LIBPATH_list the libraries provided by Julia + append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) + # From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists, + # then append them to our own. + foreach(p -> append!(PATH_list, p), (Zlib_jll.PATH_list,)) + foreach(p -> append!(LIBPATH_list, p), (Zlib_jll.LIBPATH_list,)) + + global libhdf5_hl_path = normpath(joinpath(artifact_dir, libhdf5_hl_splitpath...)) + + # Manually `dlopen()` this right now so that future invocations + # of `ccall` with its `SONAME` will find this path immediately. + global libhdf5_hl_handle = dlopen(libhdf5_hl_path) + push!(LIBPATH_list, dirname(libhdf5_hl_path)) - global libhdf5_path = abspath(joinpath(artifact"HDF5", libhdf5_splitpath...)) + global libhdf5_path = normpath(joinpath(artifact_dir, libhdf5_splitpath...)) # Manually `dlopen()` this right now so that future invocations # of `ccall` with its `SONAME` will find this path immediately.