MPICH_jll build 3.3.2+10

JuliaBinaryWrappers · May 12, 2020 · e9af6cd · e9af6cd
1 parent b2ef87d
commit e9af6cd
Show file tree

Hide file tree

Showing 36 changed files with 961 additions and 893 deletions.
diff --git a/Artifacts.toml b/Artifacts.toml
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "MPICH_jll"
 uuid = "7cb0a576-ebde-5e09-9194-50597f1243b4"
-version = "3.3.2+9"
+version = "3.3.2+10"
 
 [deps]
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

diff --git a/README.md b/README.md
@@ -2,15 +2,17 @@
 
 This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl).
 
+For more details about JLL packages, see `BinaryBuilder.jl` [documentation](https://juliapackaging.github.io/BinaryBuilder.jl/dev/jll/).
+
 ## Products
 
 The code bindings within this package are autogenerated from the following `Products` defined within the `build_tarballs.jl` file that generated this package:
 
 ```julia
 products = [
+    LibraryProduct(["libmpi"], :libmpi),
     LibraryProduct(["libmpifort"], :libmpifort),
     LibraryProduct(["libmpicxx"], :libmpicxx),
-    LibraryProduct(["libmpi"], :libmpi),
     ExecutableProduct(["mpiexec"], :mpiexec)
 ]
 ```

diff --git a/src/wrappers/aarch64-linux-gnu-libgfortran3.jl b/src/wrappers/aarch64-linux-gnu-libgfortran3.jl
@@ -1,11 +1,26 @@
 # Autogenerated wrapper script for MPICH_jll for aarch64-linux-gnu-libgfortran3
-export libmpifort, libmpicxx, libmpi, mpiexec
+export libmpi, libmpifort, libmpicxx, mpiexec
 
 using CompilerSupportLibraries_jll
 ## Global variables
 PATH = ""
 LIBPATH = ""
 LIBPATH_env = "LD_LIBRARY_PATH"
+LIBPATH_default = ""
+
+# Relative path to `libmpi`
+const libmpi_splitpath = ["lib", "libmpi.so"]
+
+# This will be filled out by __init__() for all products, as it must be done at runtime
+libmpi_path = ""
+
+# libmpi-specific global declaration
+# This will be filled out by __init__()
+libmpi_handle = C_NULL
+
+# This must be `const` so that we can use it with `ccall()`
+const libmpi = "libmpi.so.12"
+
 
 # Relative path to `libmpifort`
 const libmpifort_splitpath = ["lib", "libmpifort.so"]
@@ -35,20 +50,6 @@ libmpicxx_handle = C_NULL
 const libmpicxx = "libmpicxx.so.12"
 
 
-# Relative path to `libmpi`
-const libmpi_splitpath = ["lib", "libmpi.so"]
-
-# This will be filled out by __init__() for all products, as it must be done at runtime
-libmpi_path = ""
-
-# libmpi-specific global declaration
-# This will be filled out by __init__()
-libmpi_handle = C_NULL
-
-# This must be `const` so that we can use it with `ccall()`
-const libmpi = "libmpi.so.12"
-
-
 # Relative path to `mpiexec`
 const mpiexec_splitpath = ["bin", "mpiexec"]
 
@@ -67,8 +68,9 @@ function mpiexec(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = t
         end
     end
     if adjust_LIBPATH
-        if !isempty(get(ENV, LIBPATH_env, ""))
-            env_mapping[LIBPATH_env] = string(LIBPATH, ':', ENV[LIBPATH_env])
+        LIBPATH_base = get(ENV, LIBPATH_env, expanduser(LIBPATH_default))
+        if !isempty(LIBPATH_base)
+            env_mapping[LIBPATH_env] = string(LIBPATH, ':', LIBPATH_base)
         else
             env_mapping[LIBPATH_env] = LIBPATH
         end
@@ -94,6 +96,13 @@ function __init__()
     foreach(p -> append!(PATH_list, p), (CompilerSupportLibraries_jll.PATH_list,))
     foreach(p -> append!(LIBPATH_list, p), (CompilerSupportLibraries_jll.LIBPATH_list,))
 
+    global libmpi_path = normpath(joinpath(artifact_dir, libmpi_splitpath...))
+
+    # Manually `dlopen()` this right now so that future invocations
+    # of `ccall` with its `SONAME` will find this path immediately.
+    global libmpi_handle = dlopen(libmpi_path)
+    push!(LIBPATH_list, dirname(libmpi_path))
+
     global libmpifort_path = normpath(joinpath(artifact_dir, libmpifort_splitpath...))
 
     # Manually `dlopen()` this right now so that future invocations
@@ -108,13 +117,6 @@ function __init__()
     global libmpicxx_handle = dlopen(libmpicxx_path)
     push!(LIBPATH_list, dirname(libmpicxx_path))
 
-    global libmpi_path = normpath(joinpath(artifact_dir, libmpi_splitpath...))
-
-    # Manually `dlopen()` this right now so that future invocations
-    # of `ccall` with its `SONAME` will find this path immediately.
-    global libmpi_handle = dlopen(libmpi_path)
-    push!(LIBPATH_list, dirname(libmpi_path))
-
     global mpiexec_path = normpath(joinpath(artifact_dir, mpiexec_splitpath...))
 
     push!(PATH_list, dirname(mpiexec_path))

diff --git a/src/wrappers/aarch64-linux-gnu-libgfortran4.jl b/src/wrappers/aarch64-linux-gnu-libgfortran4.jl
@@ -1,11 +1,26 @@
 # Autogenerated wrapper script for MPICH_jll for aarch64-linux-gnu-libgfortran4
-export libmpifort, libmpicxx, libmpi, mpiexec
+export libmpi, libmpifort, libmpicxx, mpiexec
 
 using CompilerSupportLibraries_jll
 ## Global variables
 PATH = ""
 LIBPATH = ""
 LIBPATH_env = "LD_LIBRARY_PATH"
+LIBPATH_default = ""
+
+# Relative path to `libmpi`
+const libmpi_splitpath = ["lib", "libmpi.so"]
+
+# This will be filled out by __init__() for all products, as it must be done at runtime
+libmpi_path = ""
+
+# libmpi-specific global declaration
+# This will be filled out by __init__()
+libmpi_handle = C_NULL
+
+# This must be `const` so that we can use it with `ccall()`
+const libmpi = "libmpi.so.12"
+
 
 # Relative path to `libmpifort`
 const libmpifort_splitpath = ["lib", "libmpifort.so"]
@@ -35,20 +50,6 @@ libmpicxx_handle = C_NULL
 const libmpicxx = "libmpicxx.so.12"
 
 
-# Relative path to `libmpi`
-const libmpi_splitpath = ["lib", "libmpi.so"]
-
-# This will be filled out by __init__() for all products, as it must be done at runtime
-libmpi_path = ""
-
-# libmpi-specific global declaration
-# This will be filled out by __init__()
-libmpi_handle = C_NULL
-
-# This must be `const` so that we can use it with `ccall()`
-const libmpi = "libmpi.so.12"
-
-
 # Relative path to `mpiexec`
 const mpiexec_splitpath = ["bin", "mpiexec"]
 
@@ -67,8 +68,9 @@ function mpiexec(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = t
         end
     end
     if adjust_LIBPATH
-        if !isempty(get(ENV, LIBPATH_env, ""))
-            env_mapping[LIBPATH_env] = string(LIBPATH, ':', ENV[LIBPATH_env])
+        LIBPATH_base = get(ENV, LIBPATH_env, expanduser(LIBPATH_default))
+        if !isempty(LIBPATH_base)
+            env_mapping[LIBPATH_env] = string(LIBPATH, ':', LIBPATH_base)
         else
             env_mapping[LIBPATH_env] = LIBPATH
         end
@@ -94,6 +96,13 @@ function __init__()
     foreach(p -> append!(PATH_list, p), (CompilerSupportLibraries_jll.PATH_list,))
     foreach(p -> append!(LIBPATH_list, p), (CompilerSupportLibraries_jll.LIBPATH_list,))
 
+    global libmpi_path = normpath(joinpath(artifact_dir, libmpi_splitpath...))
+
+    # Manually `dlopen()` this right now so that future invocations
+    # of `ccall` with its `SONAME` will find this path immediately.
+    global libmpi_handle = dlopen(libmpi_path)
+    push!(LIBPATH_list, dirname(libmpi_path))
+
     global libmpifort_path = normpath(joinpath(artifact_dir, libmpifort_splitpath...))
 
     # Manually `dlopen()` this right now so that future invocations
@@ -108,13 +117,6 @@ function __init__()
     global libmpicxx_handle = dlopen(libmpicxx_path)
     push!(LIBPATH_list, dirname(libmpicxx_path))
 
-    global libmpi_path = normpath(joinpath(artifact_dir, libmpi_splitpath...))
-
-    # Manually `dlopen()` this right now so that future invocations
-    # of `ccall` with its `SONAME` will find this path immediately.
-    global libmpi_handle = dlopen(libmpi_path)
-    push!(LIBPATH_list, dirname(libmpi_path))
-
     global mpiexec_path = normpath(joinpath(artifact_dir, mpiexec_splitpath...))
 
     push!(PATH_list, dirname(mpiexec_path))

diff --git a/src/wrappers/aarch64-linux-gnu-libgfortran5.jl b/src/wrappers/aarch64-linux-gnu-libgfortran5.jl
@@ -1,11 +1,26 @@
 # Autogenerated wrapper script for MPICH_jll for aarch64-linux-gnu-libgfortran5
-export libmpifort, libmpicxx, libmpi, mpiexec
+export libmpi, libmpifort, libmpicxx, mpiexec
 
 using CompilerSupportLibraries_jll
 ## Global variables
 PATH = ""
 LIBPATH = ""
 LIBPATH_env = "LD_LIBRARY_PATH"
+LIBPATH_default = ""
+
+# Relative path to `libmpi`
+const libmpi_splitpath = ["lib", "libmpi.so"]
+
+# This will be filled out by __init__() for all products, as it must be done at runtime
+libmpi_path = ""
+
+# libmpi-specific global declaration
+# This will be filled out by __init__()
+libmpi_handle = C_NULL
+
+# This must be `const` so that we can use it with `ccall()`
+const libmpi = "libmpi.so.12"
+
 
 # Relative path to `libmpifort`
 const libmpifort_splitpath = ["lib", "libmpifort.so"]
@@ -35,20 +50,6 @@ libmpicxx_handle = C_NULL
 const libmpicxx = "libmpicxx.so.12"
 
 
-# Relative path to `libmpi`
-const libmpi_splitpath = ["lib", "libmpi.so"]
-
-# This will be filled out by __init__() for all products, as it must be done at runtime
-libmpi_path = ""
-
-# libmpi-specific global declaration
-# This will be filled out by __init__()
-libmpi_handle = C_NULL
-
-# This must be `const` so that we can use it with `ccall()`
-const libmpi = "libmpi.so.12"
-
-
 # Relative path to `mpiexec`
 const mpiexec_splitpath = ["bin", "mpiexec"]
 
@@ -67,8 +68,9 @@ function mpiexec(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = t
         end
     end
     if adjust_LIBPATH
-        if !isempty(get(ENV, LIBPATH_env, ""))
-            env_mapping[LIBPATH_env] = string(LIBPATH, ':', ENV[LIBPATH_env])
+        LIBPATH_base = get(ENV, LIBPATH_env, expanduser(LIBPATH_default))
+        if !isempty(LIBPATH_base)
+            env_mapping[LIBPATH_env] = string(LIBPATH, ':', LIBPATH_base)
         else
             env_mapping[LIBPATH_env] = LIBPATH
         end
@@ -94,6 +96,13 @@ function __init__()
     foreach(p -> append!(PATH_list, p), (CompilerSupportLibraries_jll.PATH_list,))
     foreach(p -> append!(LIBPATH_list, p), (CompilerSupportLibraries_jll.LIBPATH_list,))
 
+    global libmpi_path = normpath(joinpath(artifact_dir, libmpi_splitpath...))
+
+    # Manually `dlopen()` this right now so that future invocations
+    # of `ccall` with its `SONAME` will find this path immediately.
+    global libmpi_handle = dlopen(libmpi_path)
+    push!(LIBPATH_list, dirname(libmpi_path))
+
     global libmpifort_path = normpath(joinpath(artifact_dir, libmpifort_splitpath...))
 
     # Manually `dlopen()` this right now so that future invocations
@@ -108,13 +117,6 @@ function __init__()
     global libmpicxx_handle = dlopen(libmpicxx_path)
     push!(LIBPATH_list, dirname(libmpicxx_path))
 
-    global libmpi_path = normpath(joinpath(artifact_dir, libmpi_splitpath...))
-
-    # Manually `dlopen()` this right now so that future invocations
-    # of `ccall` with its `SONAME` will find this path immediately.
-    global libmpi_handle = dlopen(libmpi_path)
-    push!(LIBPATH_list, dirname(libmpi_path))
-
     global mpiexec_path = normpath(joinpath(artifact_dir, mpiexec_splitpath...))
 
     push!(PATH_list, dirname(mpiexec_path))

diff --git a/src/wrappers/aarch64-linux-musl-libgfortran3.jl b/src/wrappers/aarch64-linux-musl-libgfortran3.jl
@@ -1,11 +1,26 @@
 # Autogenerated wrapper script for MPICH_jll for aarch64-linux-musl-libgfortran3
-export libmpifort, libmpicxx, libmpi, mpiexec
+export libmpi, libmpifort, libmpicxx, mpiexec
 
 using CompilerSupportLibraries_jll
 ## Global variables
 PATH = ""
 LIBPATH = ""
 LIBPATH_env = "LD_LIBRARY_PATH"
+LIBPATH_default = ""
+
+# Relative path to `libmpi`
+const libmpi_splitpath = ["lib", "libmpi.so"]
+
+# This will be filled out by __init__() for all products, as it must be done at runtime
+libmpi_path = ""
+
+# libmpi-specific global declaration
+# This will be filled out by __init__()
+libmpi_handle = C_NULL
+
+# This must be `const` so that we can use it with `ccall()`
+const libmpi = "libmpi.so.12"
+
 
 # Relative path to `libmpifort`
 const libmpifort_splitpath = ["lib", "libmpifort.so"]
@@ -35,20 +50,6 @@ libmpicxx_handle = C_NULL
 const libmpicxx = "libmpicxx.so.12"
 
 
-# Relative path to `libmpi`
-const libmpi_splitpath = ["lib", "libmpi.so"]
-
-# This will be filled out by __init__() for all products, as it must be done at runtime
-libmpi_path = ""
-
-# libmpi-specific global declaration
-# This will be filled out by __init__()
-libmpi_handle = C_NULL
-
-# This must be `const` so that we can use it with `ccall()`
-const libmpi = "libmpi.so.12"
-
-
 # Relative path to `mpiexec`
 const mpiexec_splitpath = ["bin", "mpiexec"]
 
@@ -67,8 +68,9 @@ function mpiexec(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = t
         end
     end
     if adjust_LIBPATH
-        if !isempty(get(ENV, LIBPATH_env, ""))
-            env_mapping[LIBPATH_env] = string(LIBPATH, ':', ENV[LIBPATH_env])
+        LIBPATH_base = get(ENV, LIBPATH_env, expanduser(LIBPATH_default))
+        if !isempty(LIBPATH_base)
+            env_mapping[LIBPATH_env] = string(LIBPATH, ':', LIBPATH_base)
         else
             env_mapping[LIBPATH_env] = LIBPATH
         end
@@ -94,6 +96,13 @@ function __init__()
     foreach(p -> append!(PATH_list, p), (CompilerSupportLibraries_jll.PATH_list,))
     foreach(p -> append!(LIBPATH_list, p), (CompilerSupportLibraries_jll.LIBPATH_list,))
 
+    global libmpi_path = normpath(joinpath(artifact_dir, libmpi_splitpath...))
+
+    # Manually `dlopen()` this right now so that future invocations
+    # of `ccall` with its `SONAME` will find this path immediately.
+    global libmpi_handle = dlopen(libmpi_path)
+    push!(LIBPATH_list, dirname(libmpi_path))
+
     global libmpifort_path = normpath(joinpath(artifact_dir, libmpifort_splitpath...))
 
     # Manually `dlopen()` this right now so that future invocations
@@ -108,13 +117,6 @@ function __init__()
     global libmpicxx_handle = dlopen(libmpicxx_path)
     push!(LIBPATH_list, dirname(libmpicxx_path))
 
-    global libmpi_path = normpath(joinpath(artifact_dir, libmpi_splitpath...))
-
-    # Manually `dlopen()` this right now so that future invocations
-    # of `ccall` with its `SONAME` will find this path immediately.
-    global libmpi_handle = dlopen(libmpi_path)
-    push!(LIBPATH_list, dirname(libmpi_path))
-
     global mpiexec_path = normpath(joinpath(artifact_dir, mpiexec_splitpath...))
 
     push!(PATH_list, dirname(mpiexec_path))