From b633904cb648151864b0fcc0f0dd250308d34e9f Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Fri, 28 Aug 2026 22:39:17 -0600 Subject: [PATCH 1/3] Update BinaryBuilder files --- .github/julia/build_tarballs_utils.jl | 11 +++++++++-- .github/julia/build_tarballs_yggdrasil.jl | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/julia/build_tarballs_utils.jl b/.github/julia/build_tarballs_utils.jl index b4a3f5564..b9107823b 100644 --- a/.github/julia/build_tarballs_utils.jl +++ b/.github/julia/build_tarballs_utils.jl @@ -5,7 +5,7 @@ using BinaryBuilder, Pkg name = "UnoUtils" -version = v"2026.8.26" +version = v"2026.8.29" # Collection of sources sources = [ @@ -206,12 +206,19 @@ sed -i 's/(*opt)/opt->count() > 0/' extern/cli11/CLI11.hpp # fix-destroy.patch sed -i 's/Highs::resetGlobalScheduler(true);//' highs/interfaces/highs_c_api.cpp +TLS_FLAG="" +if [[ "${target}" == *-mingw* ]]; then + TLS_FLAG="-fno-emulated-tls" +fi + mkdir build cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=${prefix} \ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_C_FLAGS="${TLS_FLAG}" \ + -DCMAKE_CXX_FLAGS="${TLS_FLAG}" \ -DBUILD_SHARED_LIBS=OFF \ -DZLIB=OFF \ -DHIPO=ON \ @@ -303,6 +310,6 @@ build_tarballs( products, dependencies; julia_compat = "1.6", - preferred_gcc_version = v"13.2.0", # with BinaryBuilder{Base} developed + preferred_gcc_version = v"13.2.0", clang_use_lld=false, ) diff --git a/.github/julia/build_tarballs_yggdrasil.jl b/.github/julia/build_tarballs_yggdrasil.jl index c4f39e249..52e0e6f6d 100644 --- a/.github/julia/build_tarballs_yggdrasil.jl +++ b/.github/julia/build_tarballs_yggdrasil.jl @@ -101,7 +101,7 @@ dependencies = [ Dependency(PackageSpec(name="HSL_jll", uuid="017b0a0e-03f4-516a-9b91-836bbd1904dd")), Dependency(PackageSpec(name="METIS_jll", uuid="d00139f3-1899-568f-a2f0-47f597d42d70")), Dependency(PackageSpec(name="ASL_jll", uuid="ae81ac8f-d209-56e5-92de-9978fef736f9"), compat="0.1.3"), - Dependency(PackageSpec(name="MUMPS_seq_jll", uuid="d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d"), compat="~500.900.0"), + Dependency(PackageSpec(name="MUMPS_seq_jll", uuid="d7ed1dd3-d0ae-5e8e-bfb4-87a502085b8d"), compat="~500.900.100"), Dependency(PackageSpec(name="SPRAL_jll", uuid="319450e9-13b8-58e8-aa9f-8fd1420848ab")), Dependency(PackageSpec(name="libblastrampoline_jll", uuid="8e850b90-86db-534c-a0d3-1478176c7d93"), compat="5.4.0"), # For OpenMP we use libomp from `LLVMOpenMP_jll` where we use LLVM as compiler (BSD systems), From 2c5cc2cad7bd6c020aff76c5593b5bb98e5ab210 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Fri, 28 Aug 2026 23:05:39 -0600 Subject: [PATCH 2/3] Fix the issue with SPRAL --- .github/julia/build_tarballs_utils.jl | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/.github/julia/build_tarballs_utils.jl b/.github/julia/build_tarballs_utils.jl index b9107823b..b2d2e3485 100644 --- a/.github/julia/build_tarballs_utils.jl +++ b/.github/julia/build_tarballs_utils.jl @@ -38,8 +38,8 @@ sources = [ GitSource("https://github.com/ralna/spral.git", "80bc843ac3847d4a783a0e11213715a70175aee6"), # Hwloc v2.13.0 - ArchiveSource("https://download.open-mpi.org/release/hwloc/v2.13/hwloc-2.13.0.tar.bz2", - "52e936afb6ebd80f171f763fcf14f7b1f5ce98b125af5dd2f328b873b1fd0dab"), + # ArchiveSource("https://download.open-mpi.org/release/hwloc/v2.13/hwloc-2.13.0.tar.bz2", + # "52e936afb6ebd80f171f763fcf14f7b1f5ce98b125af5dd2f328b873b1fd0dab"), # Package compiler for Windows ArchiveSource("https://github.com/JuliaLang/PackageCompiler.jl/releases/download/v1.0.0/x86_64-8.1.0-release-posix-seh-rt_v6-rev0.tar.gz", "fe3f401bc936fbe6af940b26c5e0f266f762a3416f979c706e599b24082dc5c7"), @@ -172,14 +172,14 @@ cp include/*.h ${includedir} cp lib/*.a ${prefix}/lib ## ----- Compile Hwloc ----- -cd $WORKSPACE/srcdir/hwloc-* -if [[ "${target}" == *-apple-darwin* ]]; then - ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --disable-static --enable-shared -else - CFLAGS="${CFLAGS} -fPIC" ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --enable-static --disable-shared -fi -make -j${nproc} -make install +# cd $WORKSPACE/srcdir/hwloc-* +# if [[ "${target}" == *-apple-darwin* ]]; then +# ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --disable-static --enable-shared +# else +# CFLAGS="${CFLAGS} -fPIC" ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target} --enable-static --disable-shared +# fi +# make -j${nproc} +# make install ## ----- Compile SPRAL ----- cd $WORKSPACE/srcdir/spral @@ -187,7 +187,9 @@ cd $WORKSPACE/srcdir/spral meson setup builddir --cross-file="${MESON_TARGET_TOOLCHAIN}" \ --prefix=$prefix \ -Ddefault_library=static \ - -Dlibhwloc=hwloc \ + -Dlibhwloc= \ + -Dmodules=false \ + -Dopenmp=false \ -Dlibblas=blas \ -Dliblapack=lapack \ -Dbinaries=false \ From e51575b17e3d5f054185cabf393e8bb02ba6774b Mon Sep 17 00:00:00 2001 From: Alexis Montoison <35051714+amontoison@users.noreply.github.com> Date: Sat, 29 Aug 2026 11:59:17 -0600 Subject: [PATCH 3/3] Apply batched suggestions from code review Co-authored-by: Alexis Montoison <35051714+amontoison@users.noreply.github.com> --- .github/julia/build_tarballs_utils.jl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/julia/build_tarballs_utils.jl b/.github/julia/build_tarballs_utils.jl index b2d2e3485..1b2474fc9 100644 --- a/.github/julia/build_tarballs_utils.jl +++ b/.github/julia/build_tarballs_utils.jl @@ -208,19 +208,12 @@ sed -i 's/(*opt)/opt->count() > 0/' extern/cli11/CLI11.hpp # fix-destroy.patch sed -i 's/Highs::resetGlobalScheduler(true);//' highs/interfaces/highs_c_api.cpp -TLS_FLAG="" -if [[ "${target}" == *-mingw* ]]; then - TLS_FLAG="-fno-emulated-tls" -fi - mkdir build cd build cmake .. \ -DCMAKE_INSTALL_PREFIX=${prefix} \ -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS="${TLS_FLAG}" \ - -DCMAKE_CXX_FLAGS="${TLS_FLAG}" \ -DBUILD_SHARED_LIBS=OFF \ -DZLIB=OFF \ -DHIPO=ON \