[SDPA] rebuild for Julia 1.10 (#8130)

* [SDPA] rebuild for Julia 1.10 * Update build_tarballs.jl * Update build_tarballs.jl * Update S/SDPA/build_tarballs.jl Co-authored-by: Ian McInerney <[email protected]> * Update S/SDPA/build_tarballs.jl * Update build_tarballs.jl * Update build_tarballs.jl * Fix missing strtoll and strtoull * Remove make -C deps * Add missing LDFLAGS * Remove hack * Update to v7.3.17 * Update shared.diff * Update MUMPS * Don't rename configure.in * 101 * MUMPS 5.4.1 * roll back * Update LDFLAGS * Debugging * Remove cp * Use MACHTYPE * Add comment * debug * Remove ls * wildcard * debug * clean up * Update S/SDPA/build_tarballs.jl Co-authored-by: Mosè Giordano <[email protected]> * Try without libdir --------- Co-authored-by: Oscar Dowson <[email protected]> Co-authored-by: Ian McInerney <[email protected]> Co-authored-by: Mosè Giordano <[email protected]>
JuliaPackaging · Feb 21, 2024 · 2f6d0e8 · 2f6d0e8
1 parent a78df78
commit 2f6d0e8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl
@@ -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")
 ]
 
@@ -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/opt/$target/$target/sys-root/lib"
 elif [[ ${target} == *linux* ]]; then
     export LDFLAGS="-ldl -lrt"
 fi
@@ -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)
diff --git a/S/SDPA/bundled/patches/shared.diff b/S/SDPA/bundled/patches/shared.diff
@@ -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 \
@@ -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)