From 1d090c1f4d086b31fe2e5bb0f87f9a884aaf8d49 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 4 Jan 2024 10:36:35 +1300 Subject: [PATCH 01/30] [SDPA] rebuild for Julia 1.10 --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index ed8ddf1222b..4ec6e06f8e4 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -27,7 +27,7 @@ julia_compat = join("~" .* string.(getfield.(julia_versions, :major)) .* "." .* name = "SDPA" upstream_version = v"7.3.8" -version_offset = v"0.1.0" # reset to 0.0.0 once the upstream version changes +version_offset = v"0.1.1" # 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) From 2236321e04270c48fff1541611833124910dd1d7 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 5 Jan 2024 11:28:43 +1300 Subject: [PATCH 02/30] Update build_tarballs.jl --- S/SDPA/build_tarballs.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 4ec6e06f8e4..a237734c7b0 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -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) From 7cf34522d9676772a1200bfa5b7ae9dca12249df Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 5 Jan 2024 13:14:59 +1300 Subject: [PATCH 03/30] Update build_tarballs.jl --- S/SDPA/build_tarballs.jl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index a237734c7b0..dd3f35384eb 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -71,6 +71,12 @@ elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi +# work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081 +if [[ "${target}" == *mingw* ]]; then + make -C deps install-csl + cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a ./usr/lib/libmsvcrt.a +fi + ./configure --prefix=$prefix --with-pic --disable-pkg-config --build=${MACHTYPE} --host=${target} \ --enable-shared lt_cv_deplibs_check_method=pass_all \ --with-blas="-lopenblas" --with-lapack="-lopenblas" \ From 5e4951a7a0229b5d25ef0c39fc1428a8064496b8 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Sat, 6 Jan 2024 09:53:49 +1300 Subject: [PATCH 04/30] Update S/SDPA/build_tarballs.jl Co-authored-by: Ian McInerney --- S/SDPA/build_tarballs.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index dd3f35384eb..a4900001587 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -73,7 +73,6 @@ fi # work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081 if [[ "${target}" == *mingw* ]]; then - make -C deps install-csl cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a ./usr/lib/libmsvcrt.a fi From 6bbacca0bb3293c3920e6e0e56ccdd1d139d94a1 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 11 Jan 2024 10:10:14 +1300 Subject: [PATCH 05/30] Update S/SDPA/build_tarballs.jl --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index a4900001587..68f3fb4a825 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -73,7 +73,7 @@ fi # work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081 if [[ "${target}" == *mingw* ]]; then - cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a ./usr/lib/libmsvcrt.a + cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a /usr/lib/libmsvcrt.a fi ./configure --prefix=$prefix --with-pic --disable-pkg-config --build=${MACHTYPE} --host=${target} \ From 58b515101df883f34fc452bffab1b7f5616edd11 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 11 Jan 2024 14:26:47 +1300 Subject: [PATCH 06/30] Update build_tarballs.jl --- S/SDPA/build_tarballs.jl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 68f3fb4a825..4b0173bbeeb 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -66,16 +66,11 @@ 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" + export LDFLAGS="-L$prefix/bin -L/opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi -# work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081 -if [[ "${target}" == *mingw* ]]; then - cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a /usr/lib/libmsvcrt.a -fi - ./configure --prefix=$prefix --with-pic --disable-pkg-config --build=${MACHTYPE} --host=${target} \ --enable-shared lt_cv_deplibs_check_method=pass_all \ --with-blas="-lopenblas" --with-lapack="-lopenblas" \ From 7d6c39f9a3b470e00e3cbd8376c49a469bd0392c Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 11 Jan 2024 15:01:35 +1300 Subject: [PATCH 07/30] Update build_tarballs.jl --- S/SDPA/build_tarballs.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 4b0173bbeeb..63e87f269ff 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -66,6 +66,7 @@ autoreconf -vi export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then + # Needed for https://github.com/JuliaLang/julia/issues/48081 export LDFLAGS="-L$prefix/bin -L/opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" From 6a9bd5294e0383f148c41ccb3899bb1992304670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Mon, 19 Feb 2024 13:33:21 +0100 Subject: [PATCH 08/30] Fix missing strtoll and strtoull --- S/SDPA/build_tarballs.jl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 63e87f269ff..13743833a29 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -66,8 +66,9 @@ autoreconf -vi export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then - # Needed for https://github.com/JuliaLang/julia/issues/48081 - export LDFLAGS="-L$prefix/bin -L/opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib" + # work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081 + make -C deps install-csl + cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a ./usr/lib/libmsvcrt.a elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 3a235e66da74d309616f0abcc0dffdba493eed8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Mon, 19 Feb 2024 13:51:54 +0100 Subject: [PATCH 09/30] Remove make -C deps --- S/SDPA/build_tarballs.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 13743833a29..fa9336552a1 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -67,7 +67,6 @@ export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then # work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081 - make -C deps install-csl cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a ./usr/lib/libmsvcrt.a elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" From 3160138ebd626f159ab001a797cd444cc3523bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Mon, 19 Feb 2024 13:55:22 +0100 Subject: [PATCH 10/30] Add missing LDFLAGS --- S/SDPA/build_tarballs.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index fa9336552a1..2f6ec3a0d52 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -66,6 +66,7 @@ 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" # work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081 cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a ./usr/lib/libmsvcrt.a elif [[ ${target} == *linux* ]]; then From ec94a228154a8d7fdb8f461339105a98ac9a01f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Mon, 19 Feb 2024 14:02:57 +0100 Subject: [PATCH 11/30] Remove hack --- S/SDPA/build_tarballs.jl | 2 -- 1 file changed, 2 deletions(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 2f6ec3a0d52..a237734c7b0 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -67,8 +67,6 @@ 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" - # work around missing strtoll strtoull, see https://github.com/JuliaLang/julia/issues/48081 - cp /opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib/libmsvcrt.a ./usr/lib/libmsvcrt.a elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 7a337b5bd65cf4398f5d2ad067dc2673eb95915c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 11:02:23 +0100 Subject: [PATCH 12/30] Update to v7.3.17 --- S/SDPA/build_tarballs.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index a237734c7b0..4b02140a491 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -26,8 +26,8 @@ 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.1" # 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) @@ -35,7 +35,7 @@ version = VersionNumber(upstream_version.major * 100 + version_offset.major, # 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") ] From 5f91eeae53cf814bd0815aac1609a05f640032f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 11:22:20 +0100 Subject: [PATCH 13/30] Update shared.diff --- S/SDPA/bundled/patches/shared.diff | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/S/SDPA/bundled/patches/shared.diff b/S/SDPA/bundled/patches/shared.diff index 04961cfbe5d..e96306aac8f 100644 --- 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) From 5f6ac9c0dcfb0baa5c1999c9a4868be56e11fcaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 11:28:55 +0100 Subject: [PATCH 14/30] Update MUMPS --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 4b02140a491..31d5cfad99e 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -39,7 +39,7 @@ sources = [ DirectorySource("./bundled") ] -MUMPS_seq_version = v"400.1000.0" +MUMPS_seq_version = v"500.500.102" MUMPS_seq_packagespec = PackageSpec(; name = "MUMPS_seq_jll", uuid = "d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d", version = MUMPS_seq_version) From 17521b176790f4eb53b3a818114509df55bd441f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 11:30:40 +0100 Subject: [PATCH 15/30] Don't rename configure.in --- S/SDPA/build_tarballs.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 31d5cfad99e..21ed9b5c789 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -59,7 +59,6 @@ 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 From 3831d5f633db5c23cdd1d9d7e028c40b604953d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 11:34:33 +0100 Subject: [PATCH 16/30] 101 --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 21ed9b5c789..9f1c17ce08d 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -39,7 +39,7 @@ sources = [ DirectorySource("./bundled") ] -MUMPS_seq_version = v"500.500.102" +MUMPS_seq_version = v"500.500.101" MUMPS_seq_packagespec = PackageSpec(; name = "MUMPS_seq_jll", uuid = "d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d", version = MUMPS_seq_version) From 10be4c37149527e1ac6a648f209f8eb50cce119e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 11:47:41 +0100 Subject: [PATCH 17/30] MUMPS 5.4.1 --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 9f1c17ce08d..13c0c928ee5 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -39,7 +39,7 @@ sources = [ DirectorySource("./bundled") ] -MUMPS_seq_version = v"500.500.101" +MUMPS_seq_version = v"500.400.100" MUMPS_seq_packagespec = PackageSpec(; name = "MUMPS_seq_jll", uuid = "d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d", version = MUMPS_seq_version) From 439c16263690bba5ff0fe1c8601f33a8a7dca56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 14:57:36 +0100 Subject: [PATCH 18/30] roll back --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 13c0c928ee5..a1e3c616df4 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -39,7 +39,7 @@ sources = [ DirectorySource("./bundled") ] -MUMPS_seq_version = v"500.400.100" +MUMPS_seq_version = v"400.1000.0" MUMPS_seq_packagespec = PackageSpec(; name = "MUMPS_seq_jll", uuid = "d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d", version = MUMPS_seq_version) From e91484d293b07642ca63c1f61e3137b58c32c8b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 15:26:52 +0100 Subject: [PATCH 19/30] Update LDFLAGS --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index a1e3c616df4..a9e2d91a8eb 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -65,7 +65,7 @@ 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" + export LDFLAGS="-L$prefix/bin -L/opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 54ccc028cba2bd8103b8dbfa01dd66972f1b0470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 15:30:33 +0100 Subject: [PATCH 20/30] Debugging --- S/SDPA/build_tarballs.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index a9e2d91a8eb..dc8c4f1badc 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -65,6 +65,8 @@ autoreconf -vi export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then + cp /opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib/libmsvcrt.a ${libdir} + cp /opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib/libmsvcrt.a ${prefix}/bin export LDFLAGS="-L$prefix/bin -L/opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" From 1e73766b152ce4dc31151644d15c77f53f23ecf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 21:48:03 +0100 Subject: [PATCH 21/30] Remove cp --- S/SDPA/build_tarballs.jl | 2 -- 1 file changed, 2 deletions(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index dc8c4f1badc..a9e2d91a8eb 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -65,8 +65,6 @@ autoreconf -vi export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then - cp /opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib/libmsvcrt.a ${libdir} - cp /opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib/libmsvcrt.a ${prefix}/bin export LDFLAGS="-L$prefix/bin -L/opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" From a204aba1e853fb8a1567f728c0f2e3bb8e9a175b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 22:09:03 +0100 Subject: [PATCH 22/30] Use MACHTYPE --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index a9e2d91a8eb..695e4261258 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -65,7 +65,7 @@ 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 -L/opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib -lmsvcrt" + export LDFLAGS="-L$prefix/bin -L/opt/$MACHTYPE/$MACHTYPE/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 5a46efcd39b91c68c41accd99fa3e303b0fcf11b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 20 Feb 2024 22:28:38 +0100 Subject: [PATCH 23/30] Add comment --- S/SDPA/build_tarballs.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 695e4261258..bbc4e3c3039 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -65,6 +65,7 @@ autoreconf -vi export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then + # Needed for https://github.com/JuliaLang/julia/issues/48081 export LDFLAGS="-L$prefix/bin -L/opt/$MACHTYPE/$MACHTYPE/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" From 45f2767f909c3093216eb780417de0b749beabaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 21 Feb 2024 08:52:19 +0100 Subject: [PATCH 24/30] debug --- S/SDPA/build_tarballs.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index bbc4e3c3039..c46ce085913 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -66,7 +66,10 @@ export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then # Needed for https://github.com/JuliaLang/julia/issues/48081 - export LDFLAGS="-L$prefix/bin -L/opt/$MACHTYPE/$MACHTYPE/sys-root/lib -lmsvcrt" + echo $MACHTYPE + ls /opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib/libmsvcrt.a + ls /opt/$MACHTYPE/$MACHTYPE/sys-root/lib/libmsvcrt.a + export LDFLAGS="-L$prefix/bin -L/opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 3a71f725a0e7821a27fd2a65d320ff6dada99fe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 21 Feb 2024 10:09:14 +0100 Subject: [PATCH 25/30] Remove ls --- S/SDPA/build_tarballs.jl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index c46ce085913..ccc89385fc7 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -67,9 +67,8 @@ export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then # Needed for https://github.com/JuliaLang/julia/issues/48081 echo $MACHTYPE - ls /opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib/libmsvcrt.a - ls /opt/$MACHTYPE/$MACHTYPE/sys-root/lib/libmsvcrt.a - export LDFLAGS="-L$prefix/bin -L/opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib -lmsvcrt" + echo $proc_family + export LDFLAGS="-L$prefix/bin -L/opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib -L/opt/x86_64-w64-mingw32/x86_64-w64-mingw32/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 60d2f44074ee2531734d2e593d387e4fd04a5e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 21 Feb 2024 12:19:40 +0100 Subject: [PATCH 26/30] wildcard --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index ccc89385fc7..b019e79ce3f 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -68,7 +68,7 @@ if [[ ${target} == *mingw* ]]; then # Needed for https://github.com/JuliaLang/julia/issues/48081 echo $MACHTYPE echo $proc_family - export LDFLAGS="-L$prefix/bin -L/opt/i686-w64-mingw32/i686-w64-mingw32/sys-root/lib -L/opt/x86_64-w64-mingw32/x86_64-w64-mingw32/sys-root/lib -lmsvcrt" + export LDFLAGS="-L$prefix/bin -L/opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 002c5bbe64727fd53c3208191e46a8c61e01ca21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 21 Feb 2024 14:37:27 +0100 Subject: [PATCH 27/30] debug --- S/SDPA/build_tarballs.jl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index b019e79ce3f..2fc19c25718 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -68,7 +68,14 @@ if [[ ${target} == *mingw* ]]; then # Needed for https://github.com/JuliaLang/julia/issues/48081 echo $MACHTYPE echo $proc_family - export LDFLAGS="-L$prefix/bin -L/opt/*-w64-mingw32/*-w64-mingw32/sys-root/lib -lmsvcrt" + echo $target + echo $bb_target + echo $bb_full_target + echo $rust_target + echo $rust_host + echo $prefix + echo $libdir + export LDFLAGS="-L$prefix/bin -L/opt/$target/$target/sys-root/lib -lmsvcrt" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From a717f83d8f00611085bcdc8734375019ac9dd1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 21 Feb 2024 15:35:41 +0100 Subject: [PATCH 28/30] clean up --- S/SDPA/build_tarballs.jl | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index 2fc19c25718..b66a65894ae 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -66,16 +66,7 @@ export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then # Needed for https://github.com/JuliaLang/julia/issues/48081 - echo $MACHTYPE - echo $proc_family - echo $target - echo $bb_target - echo $bb_full_target - echo $rust_target - echo $rust_host - echo $prefix - echo $libdir - export LDFLAGS="-L$prefix/bin -L/opt/$target/$target/sys-root/lib -lmsvcrt" + export LDFLAGS="-L$prefix/bin -L/opt/$target/$target/sys-root/lib" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 53e4bd6c62ddb0d121dabc1ec3e8a52509926ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 21 Feb 2024 16:42:31 +0100 Subject: [PATCH 29/30] Update S/SDPA/build_tarballs.jl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mosè Giordano --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index b66a65894ae..b09fff22d1f 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -66,7 +66,7 @@ export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then # Needed for https://github.com/JuliaLang/julia/issues/48081 - export LDFLAGS="-L$prefix/bin -L/opt/$target/$target/sys-root/lib" + export LDFLAGS="-L${libdir} -L/opt/$target/$target/sys-root/lib" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi From 9154f1cf5684bf19f404ddde4a0f846cb5e36f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 21 Feb 2024 16:43:59 +0100 Subject: [PATCH 30/30] Try without libdir --- S/SDPA/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/S/SDPA/build_tarballs.jl b/S/SDPA/build_tarballs.jl index b09fff22d1f..b25b565dc0a 100755 --- a/S/SDPA/build_tarballs.jl +++ b/S/SDPA/build_tarballs.jl @@ -66,7 +66,7 @@ export CPPFLAGS="${CPPFLAGS} -I${prefix}/include -I$prefix/include/coin" export CXXFLAGS="${CXXFLAGS} -std=c++11" if [[ ${target} == *mingw* ]]; then # Needed for https://github.com/JuliaLang/julia/issues/48081 - export LDFLAGS="-L${libdir} -L/opt/$target/$target/sys-root/lib" + export LDFLAGS="-L/opt/$target/$target/sys-root/lib" elif [[ ${target} == *linux* ]]; then export LDFLAGS="-ldl -lrt" fi