From ec1b2de090858c5a5abe4ba96250bf68e30a7c7f Mon Sep 17 00:00:00 2001 From: jlbuild Date: Wed, 24 Jun 2020 18:18:48 +0000 Subject: [PATCH] Libiconv_jll build 1.16.0+5 --- Project.toml | 2 +- README.md | 4 ++-- src/wrappers/aarch64-linux-gnu.jl | 11 +---------- src/wrappers/aarch64-linux-musl.jl | 11 +---------- src/wrappers/armv7l-linux-gnueabihf.jl | 11 +---------- src/wrappers/armv7l-linux-musleabihf.jl | 11 +---------- src/wrappers/i686-linux-gnu.jl | 11 +---------- src/wrappers/i686-linux-musl.jl | 11 +---------- src/wrappers/i686-w64-mingw32.jl | 11 +---------- src/wrappers/powerpc64le-linux-gnu.jl | 11 +---------- src/wrappers/x86_64-apple-darwin14.jl | 11 +---------- src/wrappers/x86_64-linux-gnu.jl | 11 +---------- src/wrappers/x86_64-linux-musl.jl | 11 +---------- src/wrappers/x86_64-unknown-freebsd11.1.jl | 11 +---------- src/wrappers/x86_64-w64-mingw32.jl | 11 +---------- 15 files changed, 16 insertions(+), 133 deletions(-) diff --git a/Project.toml b/Project.toml index f7b0806..1fdf190 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Libiconv_jll" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" -version = "1.16.0+4" +version = "1.16.0+5" [deps] Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" diff --git a/README.md b/README.md index 91ddfae..1a72fe1 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# `Libiconv_jll.jl` (v1.16.0+4) +# `Libiconv_jll.jl` (v1.16.0+5) -This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl). The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/76f7d746b9d3572339dc2245934d4733ec19361f/L/Libiconv/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree. +This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl). The originating [`build_tarballs.jl`](https://github.com/JuliaPackaging/Yggdrasil/blob/76c1addd144431985117bcd51fefcea42a5169c6/L/Libiconv/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree. For more details about JLL packages and how to use them, see `BinaryBuilder.jl` [documentation](https://juliapackaging.github.io/BinaryBuilder.jl/dev/jll/). diff --git a/src/wrappers/aarch64-linux-gnu.jl b/src/wrappers/aarch64-linux-gnu.jl index 3526ac2..d162ab4 100644 --- a/src/wrappers/aarch64-linux-gnu.jl +++ b/src/wrappers/aarch64-linux-gnu.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/aarch64-linux-musl.jl b/src/wrappers/aarch64-linux-musl.jl index 95d9355..2131865 100644 --- a/src/wrappers/aarch64-linux-musl.jl +++ b/src/wrappers/aarch64-linux-musl.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/armv7l-linux-gnueabihf.jl b/src/wrappers/armv7l-linux-gnueabihf.jl index f3d9546..42493ae 100644 --- a/src/wrappers/armv7l-linux-gnueabihf.jl +++ b/src/wrappers/armv7l-linux-gnueabihf.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/armv7l-linux-musleabihf.jl b/src/wrappers/armv7l-linux-musleabihf.jl index bd60672..18a93ac 100644 --- a/src/wrappers/armv7l-linux-musleabihf.jl +++ b/src/wrappers/armv7l-linux-musleabihf.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/i686-linux-gnu.jl b/src/wrappers/i686-linux-gnu.jl index 3923529..5648932 100644 --- a/src/wrappers/i686-linux-gnu.jl +++ b/src/wrappers/i686-linux-gnu.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/i686-linux-musl.jl b/src/wrappers/i686-linux-musl.jl index 8c3ab77..c68b88d 100644 --- a/src/wrappers/i686-linux-musl.jl +++ b/src/wrappers/i686-linux-musl.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/i686-w64-mingw32.jl b/src/wrappers/i686-w64-mingw32.jl index f744682..aefc0b8 100644 --- a/src/wrappers/i686-w64-mingw32.jl +++ b/src/wrappers/i686-w64-mingw32.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we need to add to LIBPATH_list the libraries provided by Julia - append!(LIBPATH_list, [Sys.BINDIR, joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) global libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ';') - global LIBPATH = join(LIBPATH_list, ';') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [Sys.BINDIR, joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ';')) end # __init__() diff --git a/src/wrappers/powerpc64le-linux-gnu.jl b/src/wrappers/powerpc64le-linux-gnu.jl index 9a735be..8e334d6 100644 --- a/src/wrappers/powerpc64le-linux-gnu.jl +++ b/src/wrappers/powerpc64le-linux-gnu.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/x86_64-apple-darwin14.jl b/src/wrappers/x86_64-apple-darwin14.jl index 87874e8..c1a2708 100644 --- a/src/wrappers/x86_64-apple-darwin14.jl +++ b/src/wrappers/x86_64-apple-darwin14.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/x86_64-linux-gnu.jl b/src/wrappers/x86_64-linux-gnu.jl index c655c75..1128789 100644 --- a/src/wrappers/x86_64-linux-gnu.jl +++ b/src/wrappers/x86_64-linux-gnu.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/x86_64-linux-musl.jl b/src/wrappers/x86_64-linux-musl.jl index 4b5310e..f4e5913 100644 --- a/src/wrappers/x86_64-linux-musl.jl +++ b/src/wrappers/x86_64-linux-musl.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/x86_64-unknown-freebsd11.1.jl b/src/wrappers/x86_64-unknown-freebsd11.1.jl index 8421825..8c9eeaf 100644 --- a/src/wrappers/x86_64-unknown-freebsd11.1.jl +++ b/src/wrappers/x86_64-unknown-freebsd11.1.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we 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 libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ':') - global LIBPATH = join(LIBPATH_list, ':') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')) end # __init__() diff --git a/src/wrappers/x86_64-w64-mingw32.jl b/src/wrappers/x86_64-w64-mingw32.jl index 25004f7..1939a8e 100644 --- a/src/wrappers/x86_64-w64-mingw32.jl +++ b/src/wrappers/x86_64-w64-mingw32.jl @@ -43,8 +43,6 @@ function __init__() # Initialize PATH and LIBPATH environment variable listings global PATH_list, LIBPATH_list - # Lastly, we need to add to LIBPATH_list the libraries provided by Julia - append!(LIBPATH_list, [Sys.BINDIR, joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]) global libcharset_path = normpath(joinpath(artifact_dir, libcharset_splitpath...)) # Manually `dlopen()` this right now so that future invocations @@ -63,12 +61,5 @@ function __init__() filter!(!isempty, unique!(PATH_list)) filter!(!isempty, unique!(LIBPATH_list)) global PATH = join(PATH_list, ';') - global LIBPATH = join(LIBPATH_list, ';') - - # Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms - # that don't honor our "already opened" trick) - #for lp in LIBPATH_list - # push!(DL_LOAD_PATH, lp) - #end -end # __init__() + global LIBPATH = join(vcat(LIBPATH_list, [Sys.BINDIR, joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ';')) end # __init__()