CompilerSupportLibraries_jll build 0.2.2+0

Author: staticfloat

Artifacts.toml

@@ -1,14 +1,4 @@
 [[CompilerSupportLibraries]]
-arch = "i686"
-git-tree-sha1 = "ce5eab27297c3acd9e9edab7538395ffedefc28d"
-libc = "glibc"
-libgfortran_version = "3.0.0"
-os = "linux"
-
-    [[CompilerSupportLibraries.download]]
-    sha256 = "e5e97459bab503f093d0d33e47e6ddfc83dd569574747f671b575305cb326091"
-    url = "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl/releases/download/CompilerSupportLibraries-v0.2.0+1/CompilerSupportLibraries.v0.2.0.i686-linux-gnu-libgfortran3.tar.gz"
-[[CompilerSupportLibraries]]
 arch = "aarch64"
 git-tree-sha1 = "a87ab383a467a85525cf02bddaffb2c26aee4283"
 libc = "glibc"
@@ -376,3 +366,13 @@ os = "linux"
     [[CompilerSupportLibraries.download]]
     sha256 = "7edd57ff5af8e4335cecfbc39395f49f835eb87549cc373f7af8f53b5e0e46aa"
     url = "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl/releases/download/CompilerSupportLibraries-v0.2.0+1/CompilerSupportLibraries.v0.2.0.arm-linux-gnueabihf-libgfortran3.tar.gz"
+[[CompilerSupportLibraries]]
+arch = "i686"
+git-tree-sha1 = "3a3ea0d1a8229a164fef9a558b6cff4197afb621"
+libc = "glibc"
+libgfortran_version = "3.0.0"
+os = "linux"
+
+    [[CompilerSupportLibraries.download]]
+    sha256 = "ed4df2873b3d3916ae07e5118f8c8961d603399945a817e637a8473fc3652d41"
+    url = "https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl/releases/download/CompilerSupportLibraries-v0.2.2+0/CompilerSupportLibraries.v0.2.2.i686-linux-gnu-libgfortran3.tar.gz"

LICENSE.md

@@ -0,0 +1,7 @@
+Copyright 2020
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Project.toml

@@ -1,10 +1,10 @@
 name = "CompilerSupportLibraries_jll"
 uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
-version = "0.2.0+1"
+version = "0.2.2+0"
 
 [deps]
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 
 [compat]
-julia = "1.3"
+julia = "1.0"

README.md

@@ -2,9 +2,22 @@
 
 This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl).
 
-## Usage
+## Products
 
-The code bindings within this package are autogenerated from the `Products` defined within the `build_tarballs.jl` file that generated this package.  For example purposes, we will assume that the following products were defined:
+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(["libstdc++"], :libstdcxx),
+    LibraryProduct(["libgfortran"], :libgfortran),
+    LibraryProduct(["libgomp"], :libgomp),
+    LibraryProduct(["libgcc_s", "libgcc_s_sjlj", "libgcc_s_seh"], :libgcc_s)
+]
+```
+
+## Usage example
+
+For example purposes, we will assume that the following products were defined in the imaginary package `Example_jll`:
 
 ```julia
 products = [
@@ -14,10 +27,10 @@ products = [
 ]
 ```
 
-With such products defined, this package will contain `data_txt`, `libdataproc` and `mungify_exe` symbols exported. For `FileProduct` variables, the exported value is a string pointing to the location of the file on-disk.  For `LibraryProduct` variables, it is a string corresponding to the `SONAME` of the desired library (it will have already been `dlopen()`'ed, so typical `ccall()` usage applies), and for `ExecutableProduct` variables, the exported value is a function that can be called to set appropriate environment variables.  Example:
+With such products defined, `Example_jll` would contain `data_txt`, `libdataproc` and `mungify_exe` symbols exported. For `FileProduct` variables, the exported value is a string pointing to the location of the file on-disk.  For `LibraryProduct` variables, it is a string corresponding to the `SONAME` of the desired library (it will have already been `dlopen()`'ed, so typical `ccall()` usage applies), and for `ExecutableProduct` variables, the exported value is a function that can be called to set appropriate environment variables.  Example:
 
 ```julia
-using CompilerSupportLibraries_jll
+using Example_jll
 
 # For file products, you can access its file location directly:
 data_lines = open(data_txt, "r") do io

src/CompilerSupportLibraries_jll.jl

@@ -1,4 +1,23 @@
 module CompilerSupportLibraries_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 CompilerSupportLibraries_jll on Julia versions older than 1.3!")
+end
+
 using Pkg, Pkg.BinaryPlatforms, Pkg.Artifacts, Libdl
 import Base: UUID
 
@@ -11,7 +30,7 @@ const LIBPATH_list = String[]
 artifacts_toml = joinpath(@__DIR__, "..", "Artifacts.toml")
 
 # Extract all platforms
-artifacts = Pkg.Artifacts.load_artifacts_toml(artifacts_toml; pkg_uuid=UUID("e66e0078-7015-5450-92f7-15fbd957f2ae"))
+artifacts = Pkg.Artifacts.load_artifacts_toml(artifacts_toml; pkg_uuid=UUID("2a0299ec-ce93-5294-a8a9-ec9401735631"))
 platforms = [Pkg.Artifacts.unpack_platform(e, "CompilerSupportLibraries", artifacts_toml) for e in artifacts["CompilerSupportLibraries"]]
 
 # Filter platforms based on what wrappers we've generated on-disk

src/wrappers/i686-linux-gnu-libgfortran3.jl

@@ -1,5 +1,5 @@
 # Autogenerated wrapper script for CompilerSupportLibraries_jll for i686-linux-gnu-libgfortran3
-export libstdcxx, libgomp, libgfortran, libgcc_s
+export libstdcxx, libgfortran, libgomp, libgcc_s
 
 ## Global variables
 PATH = ""
@@ -20,32 +20,32 @@ libstdcxx_handle = C_NULL
 const libstdcxx = "libstdc++.so.6"
 
 
-# Relative path to `libgomp`
-const libgomp_splitpath = ["lib", "libgomp.so"]
+# Relative path to `libgfortran`
+const libgfortran_splitpath = ["lib", "libgfortran.so"]
 
 # This will be filled out by __init__() for all products, as it must be done at runtime
-libgomp_path = ""
+libgfortran_path = ""
 
-# libgomp-specific global declaration
+# libgfortran-specific global declaration
 # This will be filled out by __init__()
-libgomp_handle = C_NULL
+libgfortran_handle = C_NULL
 
 # This must be `const` so that we can use it with `ccall()`
-const libgomp = "libgomp.so.1"
+const libgfortran = "libgfortran.so.3"
 
 
-# Relative path to `libgfortran`
-const libgfortran_splitpath = ["lib", "libgfortran.so"]
+# Relative path to `libgomp`
+const libgomp_splitpath = ["lib", "libgomp.so"]
 
 # This will be filled out by __init__() for all products, as it must be done at runtime
-libgfortran_path = ""
+libgomp_path = ""
 
-# libgfortran-specific global declaration
+# libgomp-specific global declaration
 # This will be filled out by __init__()
-libgfortran_handle = C_NULL
+libgomp_handle = C_NULL
 
 # This must be `const` so that we can use it with `ccall()`
-const libgfortran = "libgfortran.so.3"
+const libgomp = "libgomp.so.1"
 
 
 # Relative path to `libgcc_s`
@@ -66,32 +66,34 @@ const libgcc_s = "libgcc_s.so.1"
 Open all libraries
 """
 function __init__()
-    global prefix = abspath(joinpath(@__DIR__, ".."))
+    global artifact_dir = abspath(artifact"CompilerSupportLibraries")
 
     # Initialize PATH and LIBPATH environment variable listings
     global PATH_list, LIBPATH_list
-    global libstdcxx_path = abspath(joinpath(artifact"CompilerSupportLibraries", libstdcxx_splitpath...))
+    # 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)])
+    global libstdcxx_path = normpath(joinpath(artifact_dir, libstdcxx_splitpath...))
 
     # Manually `dlopen()` this right now so that future invocations
     # of `ccall` with its `SONAME` will find this path immediately.
     global libstdcxx_handle = dlopen(libstdcxx_path)
     push!(LIBPATH_list, dirname(libstdcxx_path))
 
-    global libgomp_path = abspath(joinpath(artifact"CompilerSupportLibraries", libgomp_splitpath...))
+    global libgfortran_path = normpath(joinpath(artifact_dir, libgfortran_splitpath...))
 
     # Manually `dlopen()` this right now so that future invocations
     # of `ccall` with its `SONAME` will find this path immediately.
-    global libgomp_handle = dlopen(libgomp_path)
-    push!(LIBPATH_list, dirname(libgomp_path))
+    global libgfortran_handle = dlopen(libgfortran_path)
+    push!(LIBPATH_list, dirname(libgfortran_path))
 
-    global libgfortran_path = abspath(joinpath(artifact"CompilerSupportLibraries", libgfortran_splitpath...))
+    global libgomp_path = normpath(joinpath(artifact_dir, libgomp_splitpath...))
 
     # Manually `dlopen()` this right now so that future invocations
     # of `ccall` with its `SONAME` will find this path immediately.
-    global libgfortran_handle = dlopen(libgfortran_path)
-    push!(LIBPATH_list, dirname(libgfortran_path))
+    global libgomp_handle = dlopen(libgomp_path)
+    push!(LIBPATH_list, dirname(libgomp_path))
 
-    global libgcc_s_path = abspath(joinpath(artifact"CompilerSupportLibraries", libgcc_s_splitpath...))
+    global libgcc_s_path = normpath(joinpath(artifact_dir, libgcc_s_splitpath...))
 
     # Manually `dlopen()` this right now so that future invocations
     # of `ccall` with its `SONAME` will find this path immediately.