Skip to content

Commit 9dd822b

Browse files
jlbuildjlbuild
committed
GEOS_jll build 3.8.0+4
1 parent caeef1f commit 9dd822b

28 files changed

+573
-573
lines changed

‎Artifacts.toml

Lines changed: 78 additions & 78 deletions
Large diffs are not rendered by default.

‎Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "GEOS_jll"
22
uuid = "d604d12d-fa86-5845-992e-78dc15976526"
3-
version = "3.8.0+3"
3+
version = "3.8.0+4"
44

55
[deps]
66
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"

‎src/wrappers/aarch64-linux-gnu-cxx03.jl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
# Autogenerated wrapper script for GEOS_jll for aarch64-linux-gnu-cxx03
2-
export libgeos_cpp, libgeos
2+
export libgeos, libgeos_cpp
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
88

9-
# Relative path to `libgeos_cpp`
10-
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
9+
# Relative path to `libgeos`
10+
const libgeos_splitpath = ["lib", "libgeos_c.so"]
1111

1212
# This will be filled out by __init__() for all products, as it must be done at runtime
13-
libgeos_cpp_path = ""
13+
libgeos_path = ""
1414

15-
# libgeos_cpp-specific global declaration
15+
# libgeos-specific global declaration
1616
# This will be filled out by __init__()
17-
libgeos_cpp_handle = C_NULL
17+
libgeos_handle = C_NULL
1818

1919
# This must be `const` so that we can use it with `ccall()`
20-
const libgeos_cpp = "libgeos-3.8.0.so"
20+
const libgeos = "libgeos_c.so.1"
2121

2222

23-
# Relative path to `libgeos`
24-
const libgeos_splitpath = ["lib", "libgeos_c.so"]
23+
# Relative path to `libgeos_cpp`
24+
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
2525

2626
# This will be filled out by __init__() for all products, as it must be done at runtime
27-
libgeos_path = ""
27+
libgeos_cpp_path = ""
2828

29-
# libgeos-specific global declaration
29+
# libgeos_cpp-specific global declaration
3030
# This will be filled out by __init__()
31-
libgeos_handle = C_NULL
31+
libgeos_cpp_handle = C_NULL
3232

3333
# This must be `const` so that we can use it with `ccall()`
34-
const libgeos = "libgeos_c.so.1"
34+
const libgeos_cpp = "libgeos-3.8.0.so"
3535

3636

3737
"""
@@ -44,19 +44,19 @@ function __init__()
4444
global PATH_list, LIBPATH_list
4545
# We first need to add to LIBPATH_list the libraries provided by Julia
4646
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
47-
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
47+
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
4848

4949
# Manually `dlopen()` this right now so that future invocations
5050
# of `ccall` with its `SONAME` will find this path immediately.
51-
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
52-
push!(LIBPATH_list, dirname(libgeos_cpp_path))
51+
global libgeos_handle = dlopen(libgeos_path)
52+
push!(LIBPATH_list, dirname(libgeos_path))
5353

54-
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
54+
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
5555

5656
# Manually `dlopen()` this right now so that future invocations
5757
# of `ccall` with its `SONAME` will find this path immediately.
58-
global libgeos_handle = dlopen(libgeos_path)
59-
push!(LIBPATH_list, dirname(libgeos_path))
58+
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
59+
push!(LIBPATH_list, dirname(libgeos_cpp_path))
6060

6161
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6262
filter!(!isempty, unique!(PATH_list))

‎src/wrappers/aarch64-linux-gnu-cxx11.jl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
# Autogenerated wrapper script for GEOS_jll for aarch64-linux-gnu-cxx11
2-
export libgeos_cpp, libgeos
2+
export libgeos, libgeos_cpp
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
88

9-
# Relative path to `libgeos_cpp`
10-
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
9+
# Relative path to `libgeos`
10+
const libgeos_splitpath = ["lib", "libgeos_c.so"]
1111

1212
# This will be filled out by __init__() for all products, as it must be done at runtime
13-
libgeos_cpp_path = ""
13+
libgeos_path = ""
1414

15-
# libgeos_cpp-specific global declaration
15+
# libgeos-specific global declaration
1616
# This will be filled out by __init__()
17-
libgeos_cpp_handle = C_NULL
17+
libgeos_handle = C_NULL
1818

1919
# This must be `const` so that we can use it with `ccall()`
20-
const libgeos_cpp = "libgeos-3.8.0.so"
20+
const libgeos = "libgeos_c.so.1"
2121

2222

23-
# Relative path to `libgeos`
24-
const libgeos_splitpath = ["lib", "libgeos_c.so"]
23+
# Relative path to `libgeos_cpp`
24+
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
2525

2626
# This will be filled out by __init__() for all products, as it must be done at runtime
27-
libgeos_path = ""
27+
libgeos_cpp_path = ""
2828

29-
# libgeos-specific global declaration
29+
# libgeos_cpp-specific global declaration
3030
# This will be filled out by __init__()
31-
libgeos_handle = C_NULL
31+
libgeos_cpp_handle = C_NULL
3232

3333
# This must be `const` so that we can use it with `ccall()`
34-
const libgeos = "libgeos_c.so.1"
34+
const libgeos_cpp = "libgeos-3.8.0.so"
3535

3636

3737
"""
@@ -44,19 +44,19 @@ function __init__()
4444
global PATH_list, LIBPATH_list
4545
# We first need to add to LIBPATH_list the libraries provided by Julia
4646
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
47-
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
47+
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
4848

4949
# Manually `dlopen()` this right now so that future invocations
5050
# of `ccall` with its `SONAME` will find this path immediately.
51-
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
52-
push!(LIBPATH_list, dirname(libgeos_cpp_path))
51+
global libgeos_handle = dlopen(libgeos_path)
52+
push!(LIBPATH_list, dirname(libgeos_path))
5353

54-
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
54+
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
5555

5656
# Manually `dlopen()` this right now so that future invocations
5757
# of `ccall` with its `SONAME` will find this path immediately.
58-
global libgeos_handle = dlopen(libgeos_path)
59-
push!(LIBPATH_list, dirname(libgeos_path))
58+
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
59+
push!(LIBPATH_list, dirname(libgeos_cpp_path))
6060

6161
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6262
filter!(!isempty, unique!(PATH_list))

‎src/wrappers/aarch64-linux-musl-cxx03.jl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
# Autogenerated wrapper script for GEOS_jll for aarch64-linux-musl-cxx03
2-
export libgeos_cpp, libgeos
2+
export libgeos, libgeos_cpp
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
88

9-
# Relative path to `libgeos_cpp`
10-
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
9+
# Relative path to `libgeos`
10+
const libgeos_splitpath = ["lib", "libgeos_c.so"]
1111

1212
# This will be filled out by __init__() for all products, as it must be done at runtime
13-
libgeos_cpp_path = ""
13+
libgeos_path = ""
1414

15-
# libgeos_cpp-specific global declaration
15+
# libgeos-specific global declaration
1616
# This will be filled out by __init__()
17-
libgeos_cpp_handle = C_NULL
17+
libgeos_handle = C_NULL
1818

1919
# This must be `const` so that we can use it with `ccall()`
20-
const libgeos_cpp = "libgeos-3.8.0.so"
20+
const libgeos = "libgeos_c.so.1"
2121

2222

23-
# Relative path to `libgeos`
24-
const libgeos_splitpath = ["lib", "libgeos_c.so"]
23+
# Relative path to `libgeos_cpp`
24+
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
2525

2626
# This will be filled out by __init__() for all products, as it must be done at runtime
27-
libgeos_path = ""
27+
libgeos_cpp_path = ""
2828

29-
# libgeos-specific global declaration
29+
# libgeos_cpp-specific global declaration
3030
# This will be filled out by __init__()
31-
libgeos_handle = C_NULL
31+
libgeos_cpp_handle = C_NULL
3232

3333
# This must be `const` so that we can use it with `ccall()`
34-
const libgeos = "libgeos_c.so.1"
34+
const libgeos_cpp = "libgeos-3.8.0.so"
3535

3636

3737
"""
@@ -44,19 +44,19 @@ function __init__()
4444
global PATH_list, LIBPATH_list
4545
# We first need to add to LIBPATH_list the libraries provided by Julia
4646
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
47-
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
47+
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
4848

4949
# Manually `dlopen()` this right now so that future invocations
5050
# of `ccall` with its `SONAME` will find this path immediately.
51-
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
52-
push!(LIBPATH_list, dirname(libgeos_cpp_path))
51+
global libgeos_handle = dlopen(libgeos_path)
52+
push!(LIBPATH_list, dirname(libgeos_path))
5353

54-
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
54+
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
5555

5656
# Manually `dlopen()` this right now so that future invocations
5757
# of `ccall` with its `SONAME` will find this path immediately.
58-
global libgeos_handle = dlopen(libgeos_path)
59-
push!(LIBPATH_list, dirname(libgeos_path))
58+
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
59+
push!(LIBPATH_list, dirname(libgeos_cpp_path))
6060

6161
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6262
filter!(!isempty, unique!(PATH_list))

‎src/wrappers/aarch64-linux-musl-cxx11.jl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
# Autogenerated wrapper script for GEOS_jll for aarch64-linux-musl-cxx11
2-
export libgeos_cpp, libgeos
2+
export libgeos, libgeos_cpp
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
88

9-
# Relative path to `libgeos_cpp`
10-
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
9+
# Relative path to `libgeos`
10+
const libgeos_splitpath = ["lib", "libgeos_c.so"]
1111

1212
# This will be filled out by __init__() for all products, as it must be done at runtime
13-
libgeos_cpp_path = ""
13+
libgeos_path = ""
1414

15-
# libgeos_cpp-specific global declaration
15+
# libgeos-specific global declaration
1616
# This will be filled out by __init__()
17-
libgeos_cpp_handle = C_NULL
17+
libgeos_handle = C_NULL
1818

1919
# This must be `const` so that we can use it with `ccall()`
20-
const libgeos_cpp = "libgeos-3.8.0.so"
20+
const libgeos = "libgeos_c.so.1"
2121

2222

23-
# Relative path to `libgeos`
24-
const libgeos_splitpath = ["lib", "libgeos_c.so"]
23+
# Relative path to `libgeos_cpp`
24+
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
2525

2626
# This will be filled out by __init__() for all products, as it must be done at runtime
27-
libgeos_path = ""
27+
libgeos_cpp_path = ""
2828

29-
# libgeos-specific global declaration
29+
# libgeos_cpp-specific global declaration
3030
# This will be filled out by __init__()
31-
libgeos_handle = C_NULL
31+
libgeos_cpp_handle = C_NULL
3232

3333
# This must be `const` so that we can use it with `ccall()`
34-
const libgeos = "libgeos_c.so.1"
34+
const libgeos_cpp = "libgeos-3.8.0.so"
3535

3636

3737
"""
@@ -44,19 +44,19 @@ function __init__()
4444
global PATH_list, LIBPATH_list
4545
# We first need to add to LIBPATH_list the libraries provided by Julia
4646
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
47-
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
47+
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
4848

4949
# Manually `dlopen()` this right now so that future invocations
5050
# of `ccall` with its `SONAME` will find this path immediately.
51-
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
52-
push!(LIBPATH_list, dirname(libgeos_cpp_path))
51+
global libgeos_handle = dlopen(libgeos_path)
52+
push!(LIBPATH_list, dirname(libgeos_path))
5353

54-
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
54+
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
5555

5656
# Manually `dlopen()` this right now so that future invocations
5757
# of `ccall` with its `SONAME` will find this path immediately.
58-
global libgeos_handle = dlopen(libgeos_path)
59-
push!(LIBPATH_list, dirname(libgeos_path))
58+
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
59+
push!(LIBPATH_list, dirname(libgeos_cpp_path))
6060

6161
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6262
filter!(!isempty, unique!(PATH_list))

‎src/wrappers/arm-linux-gnueabihf-cxx03.jl

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
# Autogenerated wrapper script for GEOS_jll for arm-linux-gnueabihf-cxx03
2-
export libgeos_cpp, libgeos
2+
export libgeos, libgeos_cpp
33

44
## Global variables
55
PATH = ""
66
LIBPATH = ""
77
LIBPATH_env = "LD_LIBRARY_PATH"
88

9-
# Relative path to `libgeos_cpp`
10-
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
9+
# Relative path to `libgeos`
10+
const libgeos_splitpath = ["lib", "libgeos_c.so"]
1111

1212
# This will be filled out by __init__() for all products, as it must be done at runtime
13-
libgeos_cpp_path = ""
13+
libgeos_path = ""
1414

15-
# libgeos_cpp-specific global declaration
15+
# libgeos-specific global declaration
1616
# This will be filled out by __init__()
17-
libgeos_cpp_handle = C_NULL
17+
libgeos_handle = C_NULL
1818

1919
# This must be `const` so that we can use it with `ccall()`
20-
const libgeos_cpp = "libgeos-3.8.0.so"
20+
const libgeos = "libgeos_c.so.1"
2121

2222

23-
# Relative path to `libgeos`
24-
const libgeos_splitpath = ["lib", "libgeos_c.so"]
23+
# Relative path to `libgeos_cpp`
24+
const libgeos_cpp_splitpath = ["lib", "libgeos.so"]
2525

2626
# This will be filled out by __init__() for all products, as it must be done at runtime
27-
libgeos_path = ""
27+
libgeos_cpp_path = ""
2828

29-
# libgeos-specific global declaration
29+
# libgeos_cpp-specific global declaration
3030
# This will be filled out by __init__()
31-
libgeos_handle = C_NULL
31+
libgeos_cpp_handle = C_NULL
3232

3333
# This must be `const` so that we can use it with `ccall()`
34-
const libgeos = "libgeos_c.so.1"
34+
const libgeos_cpp = "libgeos-3.8.0.so"
3535

3636

3737
"""
@@ -44,19 +44,19 @@ function __init__()
4444
global PATH_list, LIBPATH_list
4545
# We first need to add to LIBPATH_list the libraries provided by Julia
4646
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
47-
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
47+
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
4848

4949
# Manually `dlopen()` this right now so that future invocations
5050
# of `ccall` with its `SONAME` will find this path immediately.
51-
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
52-
push!(LIBPATH_list, dirname(libgeos_cpp_path))
51+
global libgeos_handle = dlopen(libgeos_path)
52+
push!(LIBPATH_list, dirname(libgeos_path))
5353

54-
global libgeos_path = normpath(joinpath(artifact_dir, libgeos_splitpath...))
54+
global libgeos_cpp_path = normpath(joinpath(artifact_dir, libgeos_cpp_splitpath...))
5555

5656
# Manually `dlopen()` this right now so that future invocations
5757
# of `ccall` with its `SONAME` will find this path immediately.
58-
global libgeos_handle = dlopen(libgeos_path)
59-
push!(LIBPATH_list, dirname(libgeos_path))
58+
global libgeos_cpp_handle = dlopen(libgeos_cpp_path)
59+
push!(LIBPATH_list, dirname(libgeos_cpp_path))
6060

6161
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6262
filter!(!isempty, unique!(PATH_list))

0 commit comments

Comments
 (0)