Skip to content

Commit c0ee9d8

Browse files
committed
HiGHS_jll build 0.1.4+0
1 parent bd92709 commit c0ee9d8

File tree

72 files changed

+1852
-2194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1852
-2194
lines changed

Artifacts.toml

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

LICENSE

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
The Julia source code within this repository (all files under `src/`) are
2+
released under the terms of the MIT "Expat" License, the text of which is
3+
included below. This license does not apply to the binary package wrapped by
4+
this Julia package and automatically downloaded by the Julia package manager
5+
upon installing this wrapper package. The binary package's license is shipped
6+
alongside the binary itself and can be found within the
7+
`share/licenses/HiGHS` directory within its prefix.
8+
19
MIT License
210

311
Copyright (c) 2020 JuliaBinaryWrappers

LICENSE.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "HiGHS_jll"
22
uuid = "8fd58aa0-07eb-5a78-9b36-339c94fd15ea"
3-
version = "0.1.3+1"
3+
version = "0.1.4+0"
44

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

README.md

Lines changed: 83 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,96 @@
1-
# HiGHS_jll.jl
1+
# `HiGHS_jll.jl` (v0.1.4+0)
22

3-
This is an autogenerated package constructed using [`BinaryBuilder.jl`](https://github.com/JuliaPackaging/BinaryBuilder.jl).
3+
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/8f25053b11378065b6c4af7d8ea3af292bbbd1f1/H/HiGHS/build_tarballs.jl) script can be found on [`Yggdrasil`](https://github.com/JuliaPackaging/Yggdrasil/), the community build tree.
44

5-
For more details about JLL packages, see `BinaryBuilder.jl` [documentation](https://juliapackaging.github.io/BinaryBuilder.jl/dev/jll/).
5+
For more details about JLL packages and how to use them, see `BinaryBuilder.jl` [documentation](https://juliapackaging.github.io/BinaryBuilder.jl/dev/jll/).
66

7-
## Products
7+
## Sources
8+
9+
The tarballs for `HiGHS_jll.jl` have been built from these sources:
810

9-
The code bindings within this package are autogenerated from the following `Products` defined within the `build_tarballs.jl` file that generated this package:
11+
* git repository: https://github.com/ERGO-Code/HiGHS.git (revision: `0b4cb7f882a6c5d208fbb2edb4d8c416291ed4f5`)
12+
* files in directory, relative to originating `build_tarballs.jl`: [`./bundled`](https://github.com/JuliaPackaging/Yggdrasil/tree/8f25053b11378065b6c4af7d8ea3af292bbbd1f1/H/HiGHS/bundled)
1013

11-
```julia
12-
products = [
13-
LibraryProduct(["libipx"], :libipx),
14-
LibraryProduct(["libhighs"], :libhighs)
15-
]
16-
```
14+
## Platforms
1715

18-
## Usage example
16+
`HiGHS_jll.jl` is available for the following platforms:
1917

20-
For example purposes, we will assume that the following products were defined in the imaginary package `Example_jll`:
18+
* `Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`aarch64-linux-gnu-libgfortran3-cxx03`)
19+
* `Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`aarch64-linux-gnu-libgfortran3-cxx11`)
20+
* `Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`aarch64-linux-gnu-libgfortran4-cxx03`)
21+
* `Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`aarch64-linux-gnu-libgfortran4-cxx11`)
22+
* `Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`aarch64-linux-gnu-libgfortran5-cxx03`)
23+
* `Linux(:aarch64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`aarch64-linux-gnu-libgfortran5-cxx11`)
24+
* `Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`aarch64-linux-musl-libgfortran3-cxx03`)
25+
* `Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`aarch64-linux-musl-libgfortran3-cxx11`)
26+
* `Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`aarch64-linux-musl-libgfortran4-cxx03`)
27+
* `Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`aarch64-linux-musl-libgfortran4-cxx11`)
28+
* `Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`aarch64-linux-musl-libgfortran5-cxx03`)
29+
* `Linux(:aarch64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`aarch64-linux-musl-libgfortran5-cxx11`)
30+
* `Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`armv7l-linux-gnueabihf-libgfortran3-cxx03`)
31+
* `Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`armv7l-linux-gnueabihf-libgfortran3-cxx11`)
32+
* `Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`armv7l-linux-gnueabihf-libgfortran4-cxx03`)
33+
* `Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`armv7l-linux-gnueabihf-libgfortran4-cxx11`)
34+
* `Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`armv7l-linux-gnueabihf-libgfortran5-cxx03`)
35+
* `Linux(:armv7l, libc=:glibc, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`armv7l-linux-gnueabihf-libgfortran5-cxx11`)
36+
* `Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`armv7l-linux-musleabihf-libgfortran3-cxx03`)
37+
* `Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`armv7l-linux-musleabihf-libgfortran3-cxx11`)
38+
* `Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`armv7l-linux-musleabihf-libgfortran4-cxx03`)
39+
* `Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`armv7l-linux-musleabihf-libgfortran4-cxx11`)
40+
* `Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`armv7l-linux-musleabihf-libgfortran5-cxx03`)
41+
* `Linux(:armv7l, libc=:musl, call_abi=:eabihf, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`armv7l-linux-musleabihf-libgfortran5-cxx11`)
42+
* `Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`i686-linux-gnu-libgfortran3-cxx03`)
43+
* `Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`i686-linux-gnu-libgfortran3-cxx11`)
44+
* `Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`i686-linux-gnu-libgfortran4-cxx03`)
45+
* `Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`i686-linux-gnu-libgfortran4-cxx11`)
46+
* `Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`i686-linux-gnu-libgfortran5-cxx03`)
47+
* `Linux(:i686, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`i686-linux-gnu-libgfortran5-cxx11`)
48+
* `Linux(:i686, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`i686-linux-musl-libgfortran3-cxx03`)
49+
* `Linux(:i686, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`i686-linux-musl-libgfortran3-cxx11`)
50+
* `Linux(:i686, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`i686-linux-musl-libgfortran4-cxx03`)
51+
* `Linux(:i686, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`i686-linux-musl-libgfortran4-cxx11`)
52+
* `Linux(:i686, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`i686-linux-musl-libgfortran5-cxx03`)
53+
* `Linux(:i686, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`i686-linux-musl-libgfortran5-cxx11`)
54+
* `Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`powerpc64le-linux-gnu-libgfortran3-cxx03`)
55+
* `Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`powerpc64le-linux-gnu-libgfortran3-cxx11`)
56+
* `Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`powerpc64le-linux-gnu-libgfortran4-cxx03`)
57+
* `Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`powerpc64le-linux-gnu-libgfortran4-cxx11`)
58+
* `Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`powerpc64le-linux-gnu-libgfortran5-cxx03`)
59+
* `Linux(:powerpc64le, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`powerpc64le-linux-gnu-libgfortran5-cxx11`)
60+
* `MacOS(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`x86_64-apple-darwin14-libgfortran3-cxx03`)
61+
* `MacOS(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`x86_64-apple-darwin14-libgfortran3-cxx11`)
62+
* `MacOS(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`x86_64-apple-darwin14-libgfortran4-cxx03`)
63+
* `MacOS(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`x86_64-apple-darwin14-libgfortran4-cxx11`)
64+
* `MacOS(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`x86_64-apple-darwin14-libgfortran5-cxx03`)
65+
* `MacOS(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`x86_64-apple-darwin14-libgfortran5-cxx11`)
66+
* `Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`x86_64-linux-gnu-libgfortran3-cxx03`)
67+
* `Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`x86_64-linux-gnu-libgfortran3-cxx11`)
68+
* `Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`x86_64-linux-gnu-libgfortran4-cxx03`)
69+
* `Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`x86_64-linux-gnu-libgfortran4-cxx11`)
70+
* `Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`x86_64-linux-gnu-libgfortran5-cxx03`)
71+
* `Linux(:x86_64, libc=:glibc, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`x86_64-linux-gnu-libgfortran5-cxx11`)
72+
* `Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`x86_64-linux-musl-libgfortran3-cxx03`)
73+
* `Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`x86_64-linux-musl-libgfortran3-cxx11`)
74+
* `Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`x86_64-linux-musl-libgfortran4-cxx03`)
75+
* `Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`x86_64-linux-musl-libgfortran4-cxx11`)
76+
* `Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`x86_64-linux-musl-libgfortran5-cxx03`)
77+
* `Linux(:x86_64, libc=:musl, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`x86_64-linux-musl-libgfortran5-cxx11`)
78+
* `FreeBSD(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx03))` (`x86_64-unknown-freebsd11.1-libgfortran3-cxx03`)
79+
* `FreeBSD(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"3.0.0", cxxstring_abi=:cxx11))` (`x86_64-unknown-freebsd11.1-libgfortran3-cxx11`)
80+
* `FreeBSD(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx03))` (`x86_64-unknown-freebsd11.1-libgfortran4-cxx03`)
81+
* `FreeBSD(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"4.0.0", cxxstring_abi=:cxx11))` (`x86_64-unknown-freebsd11.1-libgfortran4-cxx11`)
82+
* `FreeBSD(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx03))` (`x86_64-unknown-freebsd11.1-libgfortran5-cxx03`)
83+
* `FreeBSD(:x86_64, compiler_abi=CompilerABI(libgfortran_version=v"5.0.0", cxxstring_abi=:cxx11))` (`x86_64-unknown-freebsd11.1-libgfortran5-cxx11`)
2184

22-
```julia
23-
products = [
24-
FileProduct("src/data.txt", :data_txt),
25-
LibraryProduct("libdataproc", :libdataproc),
26-
ExecutableProduct("mungify", :mungify_exe)
27-
]
28-
```
85+
## Dependencies
2986

30-
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:
87+
The following JLL packages are required by `HiGHS_jll.jl`:
3188

32-
```julia
33-
using Example_jll
89+
* [`CompilerSupportLibraries_jll`](https://github.com/JuliaBinaryWrappers/CompilerSupportLibraries_jll.jl)
3490

35-
# For file products, you can access its file location directly:
36-
data_lines = open(data_txt, "r") do io
37-
readlines(io)
38-
end
91+
## Products
3992

40-
# For library products, you can use the exported variable name in `ccall()` invocations directly
41-
num_chars = ccall((:count_characters, libdataproc), Cint, (Cstring, Cint), data_lines[1], length(data_lines[1]))
93+
The code bindings within this package are autogenerated from the following `Products`:
4294

43-
# For executable products, you can use the exported variable name as a function that you can call
44-
mungify_exe() do mungify_exe_path
45-
run(`$mungify_exe_path $num_chars`)
46-
end
47-
```
95+
* `LibraryProduct`: `libhighs`
96+
* `LibraryProduct`: `libipx`

src/HiGHS_jll.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
module HiGHS_jll
22

3+
if isdefined(Base, :Experimental) && isdefined(Base.Experimental, Symbol("@optlevel"))
4+
@eval Base.Experimental.@optlevel 0
5+
end
6+
37
if VERSION < v"1.3.0-rc4"
48
# We lie a bit in the registry that JLL packages are usable on Julia 1.0-1.2.
59
# This is to allow packages that might want to support Julia 1.0 to get the
Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Autogenerated wrapper script for HiGHS_jll for aarch64-linux-gnu-libgfortran3-cxx03
2-
export libipx, libhighs
2+
export libhighs, libipx
33

44
using CompilerSupportLibraries_jll
55
## Global variables
@@ -8,32 +8,32 @@ LIBPATH = ""
88
LIBPATH_env = "LD_LIBRARY_PATH"
99
LIBPATH_default = ""
1010

11-
# Relative path to `libipx`
12-
const libipx_splitpath = ["lib", "libipx.so"]
11+
# Relative path to `libhighs`
12+
const libhighs_splitpath = ["lib", "libhighs.so"]
1313

1414
# This will be filled out by __init__() for all products, as it must be done at runtime
15-
libipx_path = ""
15+
libhighs_path = ""
1616

17-
# libipx-specific global declaration
17+
# libhighs-specific global declaration
1818
# This will be filled out by __init__()
19-
libipx_handle = C_NULL
19+
libhighs_handle = C_NULL
2020

2121
# This must be `const` so that we can use it with `ccall()`
22-
const libipx = "libipx.so"
22+
const libhighs = "libhighs.so.1.0"
2323

2424

25-
# Relative path to `libhighs`
26-
const libhighs_splitpath = ["lib", "libhighs.so"]
25+
# Relative path to `libipx`
26+
const libipx_splitpath = ["lib", "libipx.so"]
2727

2828
# This will be filled out by __init__() for all products, as it must be done at runtime
29-
libhighs_path = ""
29+
libipx_path = ""
3030

31-
# libhighs-specific global declaration
31+
# libipx-specific global declaration
3232
# This will be filled out by __init__()
33-
libhighs_handle = C_NULL
33+
libipx_handle = C_NULL
3434

3535
# This must be `const` so that we can use it with `ccall()`
36-
const libhighs = "libhighs.so.1.0"
36+
const libipx = "libipx.so"
3737

3838

3939
"""
@@ -44,37 +44,31 @@ function __init__()
4444

4545
# Initialize PATH and LIBPATH environment variable listings
4646
global PATH_list, LIBPATH_list
47-
# We first need to add to LIBPATH_list the libraries provided by Julia
48-
append!(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)])
4947
# From the list of our dependencies, generate a tuple of all the PATH and LIBPATH lists,
5048
# then append them to our own.
5149
foreach(p -> append!(PATH_list, p), (CompilerSupportLibraries_jll.PATH_list,))
5250
foreach(p -> append!(LIBPATH_list, p), (CompilerSupportLibraries_jll.LIBPATH_list,))
5351

54-
global libipx_path = normpath(joinpath(artifact_dir, libipx_splitpath...))
52+
global libhighs_path = normpath(joinpath(artifact_dir, libhighs_splitpath...))
5553

5654
# Manually `dlopen()` this right now so that future invocations
5755
# of `ccall` with its `SONAME` will find this path immediately.
58-
global libipx_handle = dlopen(libipx_path)
59-
push!(LIBPATH_list, dirname(libipx_path))
56+
global libhighs_handle = dlopen(libhighs_path)
57+
push!(LIBPATH_list, dirname(libhighs_path))
6058

61-
global libhighs_path = normpath(joinpath(artifact_dir, libhighs_splitpath...))
59+
global libipx_path = normpath(joinpath(artifact_dir, libipx_splitpath...))
6260

6361
# Manually `dlopen()` this right now so that future invocations
6462
# of `ccall` with its `SONAME` will find this path immediately.
65-
global libhighs_handle = dlopen(libhighs_path)
66-
push!(LIBPATH_list, dirname(libhighs_path))
63+
global libipx_handle = dlopen(libipx_path)
64+
push!(LIBPATH_list, dirname(libipx_path))
6765

6866
# Filter out duplicate and empty entries in our PATH and LIBPATH entries
6967
filter!(!isempty, unique!(PATH_list))
7068
filter!(!isempty, unique!(LIBPATH_list))
7169
global PATH = join(PATH_list, ':')
72-
global LIBPATH = join(LIBPATH_list, ':')
70+
global LIBPATH = join(vcat(LIBPATH_list, [joinpath(Sys.BINDIR, Base.LIBDIR, "julia"), joinpath(Sys.BINDIR, Base.LIBDIR)]), ':')
7371

74-
# Add each element of LIBPATH to our DL_LOAD_PATH (necessary on platforms
75-
# that don't honor our "already opened" trick)
76-
#for lp in LIBPATH_list
77-
# push!(DL_LOAD_PATH, lp)
78-
#end
72+
7973
end # __init__()
8074

0 commit comments

Comments
 (0)