Skip to content

Commit 6116645

Browse files
authored
[Uno] update to v2.0.0 (#11615)
* [Uno] update to v2.0.0 * Update build_tarballs.jl * Update build_tarballs.jl: exclude riscv64
1 parent dc8b710 commit 6116645

File tree

1 file changed

+15
-4
lines changed

1 file changed

+15
-4
lines changed

U/Uno/build_tarballs.jl

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ using BinaryBuilder, Pkg
44

55
name = "Uno"
66

7-
version = v"1.3.0"
7+
version = v"2.0.0"
88

99
sources = [
1010
GitSource(
1111
"https://github.com/cvanaret/Uno.git",
12-
"79611a3c5d6196f59b3accc8e21a774b5670164c",
12+
"8ea41fcd7250ad4489abe42e3ef1c924e2a323ee",
1313
),
1414
]
1515

@@ -42,6 +42,7 @@ cmake \
4242
-DCMAKE_BUILD_TYPE=Release \
4343
-DAMPLSOLVER=${libdir}/libasl.${dlext} \
4444
-DHIGHS=${LIBHIGHS} \
45+
-DBQPD=${prefix}/lib/libbqpd.a \
4546
-DHSL=${libdir}/libhsl.${dlext} \
4647
-DBLA_VENDOR="libblastrampoline" \
4748
-DMUMPS_INCLUDE_DIR=${includedir} \
@@ -61,12 +62,20 @@ install -v -m 755 "uno_ampl${exeext}" -t "${bindir}"
6162
6263
# Currently, Uno does not provide a shared library. This may be useful in the future once it has a C API.
6364
# We just check that we can generate it, but we don't include it in the tarballs.
64-
${CXX} -shared $(flagon -Wl,--whole-archive) libuno.a $(flagon -Wl,--no-whole-archive) -o libuno.${dlext} -L${libdir} -l${OMP} -l${LBT} -ldmumps -lmetis -lhsl -lhighs
65+
${CXX} -shared $(flagon -Wl,--whole-archive) libuno.a $(flagon -Wl,--no-whole-archive) -o libuno.${dlext} -L${prefix}/lib -lbqpd -L${libdir} -l${OMP} -l${LBT} -ldmumps -lmetis -lhsl -lhighs -lgfortran
6566
# cp libuno.${dlext} ${libdir}/libuno.${dlext}
67+
68+
# Uno
69+
install_license ${WORKSPACE}/srcdir/Uno/LICENSE
70+
71+
# BQPD
72+
cp ${prefix}/share/licenses/BQPD/LICENSE ${WORKSPACE}/srcdir/Uno/LICENSE_BQPD
73+
install_license ${WORKSPACE}/srcdir/Uno/LICENSE_BQPD
6674
"""
6775

6876
platforms = supported_platforms()
6977
filter!(p -> !(Sys.isfreebsd(p) && arch(p) == "aarch64"), platforms)
78+
filter!(p -> arch(p) != "riscv64", platforms)
7079
platforms = expand_cxxstring_abis(platforms)
7180

7281
products = [
@@ -77,7 +86,8 @@ products = [
7786
]
7887

7988
dependencies = [
80-
Dependency(PackageSpec(name="HiGHS_jll", uuid="8fd58aa0-07eb-5a78-9b36-339c94fd15ea")),
89+
BuildDependency(PackageSpec(name="BQPD_jll", uuid="1325ac01-0a49-589f-8355-43321054aaab")),
90+
Dependency(PackageSpec(name="HiGHS_jll", uuid="8fd58aa0-07eb-5a78-9b36-339c94fd15ea"), compat="1.11.0"),
8191
Dependency(PackageSpec(name="HSL_jll", uuid="017b0a0e-03f4-516a-9b91-836bbd1904dd")),
8292
Dependency(PackageSpec(name="METIS_jll", uuid="d00139f3-1899-568f-a2f0-47f597d42d70")),
8393
Dependency(PackageSpec(name="ASL_jll", uuid="ae81ac8f-d209-56e5-92de-9978fef736f9"), compat="0.1.3"),
@@ -104,4 +114,5 @@ build_tarballs(
104114
dependencies;
105115
julia_compat = "1.9",
106116
preferred_gcc_version = v"10.2.0",
117+
clang_use_lld=false,
107118
)

0 commit comments

Comments
 (0)