Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SDPA] rebuild for Julia 1.10 #8130

Merged
merged 30 commits into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from 28 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions S/SDPA/build_tarballs.jl
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ julia_compat = join("~" .* string.(getfield.(julia_versions, :major)) .* "." .*
# map a prerelease of 2.7.0 to 200.690.000.

name = "SDPA"
upstream_version = v"7.3.8"
version_offset = v"0.1.0" # reset to 0.0.0 once the upstream version changes
upstream_version = v"7.3.17"
version_offset = v"0.0.0" # reset to 0.0.0 once the upstream version changes
version = VersionNumber(upstream_version.major * 100 + version_offset.major,
upstream_version.minor * 100 + version_offset.minor,
upstream_version.patch * 100 + version_offset.patch)

# Collection of sources required to build SDPABuilder
sources = [
ArchiveSource("https://sourceforge.net/projects/sdpa/files/sdpa/sdpa_$(upstream_version).tar.gz",
"c7541333da2f0bb2d18e90dbf758ac7cc099f3f7da3f256b284b0725f96d4117")
"3983489392c9ac7ae30d699ed708da346700d387560a79a1f704034a377281a8")
DirectorySource("./bundled")
]

Expand All @@ -59,14 +59,14 @@ update_configure_scripts

# Apply patches
atomic_patch -p1 $WORKSPACE/srcdir/patches/shared.diff
mv configure.in configure.ac
atomic_patch -p1 $WORKSPACE/srcdir/patches/lt_init.diff
autoreconf -vi

export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin"
export CXXFLAGS="${CXXFLAGS} -std=c++11"
if [[ ${target} == *mingw* ]]; then
export LDFLAGS="-L$prefix/bin"
# Needed for https://github.com/JuliaLang/julia/issues/48081
export LDFLAGS="-L$prefix/bin -L/opt/$target/$target/sys-root/lib"
blegat marked this conversation as resolved.
Show resolved Hide resolved
elif [[ ${target} == *linux* ]]; then
export LDFLAGS="-ldl -lrt"
fi
Expand Down Expand Up @@ -144,4 +144,5 @@ dependencies = [
# Build the tarballs, and possibly a `build.jl` as well.
build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
preferred_gcc_version = v"8",
clang_use_lld = false,
julia_compat)
4 changes: 2 additions & 2 deletions S/SDPA/bundled/patches/shared.diff
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/Makefile.am b/Makefile.am
index afadcff..400b3cf 100644
index deefb65..eacbb87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,20 +20,22 @@ sdpa_call.h sdpa_chordal.h sdpa_dataset.h sdpa_dpotrf.h \
Expand All @@ -25,7 +25,7 @@ index afadcff..400b3cf 100644

bin_PROGRAMS = sdpa
sdpa_SOURCES = sdpa_exe.cpp
-sdpa_LDADD = -L. -lsdpa $(MUMPS_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(PTHREAD_LIBS) $(FCLIBS)
-sdpa_LDADD = ./libsdpa.a $(MUMPS_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(PTHREAD_LIBS) $(FCLIBS)
+sdpa_LDADD = libsdpa.la $(MUMPS_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(PTHREAD_LIBS) $(FCLIBS)
sdpa_CXXFLAGS = $(pthread_cflags) $(MUMPS_INCLUDE) $(PTHREAD_INCLUDE)

Expand Down