From 48b9f7d013cb226a678d11ef15bda07ef3ac7cde Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Mon, 10 Feb 2020 08:23:22 -0500 Subject: [PATCH 1/3] Delete extra libraries on Windows Fix #7 --- S/SuiteSparse@5/build_tarballs.jl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/S/SuiteSparse@5/build_tarballs.jl b/S/SuiteSparse@5/build_tarballs.jl index 461e253aa07..ee544dd42a8 100644 --- a/S/SuiteSparse@5/build_tarballs.jl +++ b/S/SuiteSparse@5/build_tarballs.jl @@ -61,6 +61,12 @@ if [[ ${target} == *-apple-* ]] || [[ ${target} == *freebsd* ]]; then done fi +# Delete the extra soversion libraries built. https://github.com/JuliaPackaging/Yggdrasil/issues/7 +if [[ "${target}" == *-mingw* ]]; then + rm -f ${libdir}/lib*.*.${dlext} + rm -f ${libdir}/lib*.*.*.${dlext} +fi + # Compile SuiteSparse_wrapper shim cd $WORKSPACE/srcdir/SuiteSparse_wrapper "${CC}" -O2 -shared -fPIC -I${prefix}/include SuiteSparse_wrapper.c -o ${libdir}/libsuitesparse_wrapper.${dlext} -L${libdir} -lcholmod From 5d4aa930555c01082780de2072ff8f0a5ca4a0d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Mon, 10 Feb 2020 14:09:13 +0000 Subject: [PATCH 2/3] [SuiteSparse] Use new types for sources and dependencies --- S/SuiteSparse@5/build_tarballs.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/S/SuiteSparse@5/build_tarballs.jl b/S/SuiteSparse@5/build_tarballs.jl index ee544dd42a8..d53dbae1193 100644 --- a/S/SuiteSparse@5/build_tarballs.jl +++ b/S/SuiteSparse@5/build_tarballs.jl @@ -5,9 +5,9 @@ version = v"5.4.0" # Collection of sources required to build SuiteSparse sources = [ - "https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$(version).tar.gz" => - "d9d62d539410d66550d0b795503a556830831f50087723cb191a030525eda770", - "./bundled", + FileSource("https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v$(version).tar.gz", + "d9d62d539410d66550d0b795503a556830831f50087723cb191a030525eda770"), + DirectorySource("./bundled"), ] # Bash recipe for building across all platforms @@ -95,8 +95,8 @@ products = [ # Dependencies that must be installed before this package can be built dependencies = [ - "OpenBLAS_jll", - "METIS_jll", + Dependency("OpenBLAS_jll"), + Dependency("METIS_jll"), ] # Build the tarballs. From 599aed84cc0fa000bcf884b6dbfc9797349f40ff Mon Sep 17 00:00:00 2001 From: "Viral B. Shah" Date: Mon, 10 Feb 2020 17:36:20 -0500 Subject: [PATCH 3/3] Rename directory SuiteSparse@5 -> SuiteSparse install_license for suitesparse --- S/{SuiteSparse@5 => SuiteSparse}/build_tarballs.jl | 2 ++ .../bundled/SuiteSparse_wrapper/SuiteSparse_wrapper.c | 0 .../bundled/patches/SuiteSparse-shlib.patch | 0 3 files changed, 2 insertions(+) rename S/{SuiteSparse@5 => SuiteSparse}/build_tarballs.jl (99%) rename S/{SuiteSparse@5 => SuiteSparse}/bundled/SuiteSparse_wrapper/SuiteSparse_wrapper.c (100%) rename S/{SuiteSparse@5 => SuiteSparse}/bundled/patches/SuiteSparse-shlib.patch (100%) diff --git a/S/SuiteSparse@5/build_tarballs.jl b/S/SuiteSparse/build_tarballs.jl similarity index 99% rename from S/SuiteSparse@5/build_tarballs.jl rename to S/SuiteSparse/build_tarballs.jl index d53dbae1193..d6cdff66418 100644 --- a/S/SuiteSparse@5/build_tarballs.jl +++ b/S/SuiteSparse/build_tarballs.jl @@ -67,6 +67,8 @@ if [[ "${target}" == *-mingw* ]]; then rm -f ${libdir}/lib*.*.*.${dlext} fi +install_license LICENSE.txt + # Compile SuiteSparse_wrapper shim cd $WORKSPACE/srcdir/SuiteSparse_wrapper "${CC}" -O2 -shared -fPIC -I${prefix}/include SuiteSparse_wrapper.c -o ${libdir}/libsuitesparse_wrapper.${dlext} -L${libdir} -lcholmod diff --git a/S/SuiteSparse@5/bundled/SuiteSparse_wrapper/SuiteSparse_wrapper.c b/S/SuiteSparse/bundled/SuiteSparse_wrapper/SuiteSparse_wrapper.c similarity index 100% rename from S/SuiteSparse@5/bundled/SuiteSparse_wrapper/SuiteSparse_wrapper.c rename to S/SuiteSparse/bundled/SuiteSparse_wrapper/SuiteSparse_wrapper.c diff --git a/S/SuiteSparse@5/bundled/patches/SuiteSparse-shlib.patch b/S/SuiteSparse/bundled/patches/SuiteSparse-shlib.patch similarity index 100% rename from S/SuiteSparse@5/bundled/patches/SuiteSparse-shlib.patch rename to S/SuiteSparse/bundled/patches/SuiteSparse-shlib.patch