From 235a1f6c58baa16ea1e1ac537d50ae4bf9b4e82a Mon Sep 17 00:00:00 2001 From: Brian Jackson Date: Wed, 26 Jan 2022 13:52:18 -0500 Subject: [PATCH 1/3] New Recipe: qdldl v0.1.5 --- Q/qdldl/build_tarballs.jl | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 Q/qdldl/build_tarballs.jl diff --git a/Q/qdldl/build_tarballs.jl b/Q/qdldl/build_tarballs.jl new file mode 100644 index 00000000000..2404b78fc28 --- /dev/null +++ b/Q/qdldl/build_tarballs.jl @@ -0,0 +1,45 @@ +# Note that this script can accept some limited command-line arguments, run +# `julia build_tarballs.jl --help` to see a usage message. +using BinaryBuilder, Pkg + +name = "qdldl" +version = v"0.1.5" + +# Collection of sources required to complete build +sources = [ + ArchiveSource("https://github.com/osqp/qdldl/archive/refs/tags/v$(version).tar.gz", "2868b0e61b7424174e9adef3cb87478329f8ab2075211ef28fe477f29e0e5c99") +] + +# Bash recipe for building across all platforms +script = raw""" +cd $WORKSPACE/srcdir +cd qdldl-0.1.5/ +mkdir build_double +cd build_double/ +cmake -DCMAKE_INSTALL_PREFIX=$prefix/double -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DDFLOAT=0 .. +cmake --build . -j8 +make install +cd .. +mkdir build_single +cd build_single/ +cmake -DCMAKE_INSTALL_PREFIX=$prefix/single -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DDFLOAT=1 .. +cmake --build . -j8 +make install +""" + +# These are the platforms we will build for by default, unless further +# platforms are passed in on the command line +platforms = supported_platforms() + +# The products that we will ensure are always built +products = [ + LibraryProduct("libqdldl", :libqdldl64, "double/lib"), + LibraryProduct("libqdldl", :libqdldl32, "single/lib") +] + +# Dependencies that must be installed before this package can be built +dependencies = Dependency[ +] + +# Build the tarballs, and possibly a `build.jl` as well. +build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6") From 48ed9447174a56091f53d3a2b0143d3855206dd6 Mon Sep 17 00:00:00 2001 From: Brian Jackson Date: Wed, 26 Jan 2022 15:39:39 -0500 Subject: [PATCH 2/3] Build only Float64 for now --- Q/qdldl/build_tarballs.jl | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/Q/qdldl/build_tarballs.jl b/Q/qdldl/build_tarballs.jl index 2404b78fc28..12c56153caa 100644 --- a/Q/qdldl/build_tarballs.jl +++ b/Q/qdldl/build_tarballs.jl @@ -14,16 +14,10 @@ sources = [ script = raw""" cd $WORKSPACE/srcdir cd qdldl-0.1.5/ -mkdir build_double -cd build_double/ -cmake -DCMAKE_INSTALL_PREFIX=$prefix/double -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DDFLOAT=0 .. -cmake --build . -j8 -make install -cd .. -mkdir build_single -cd build_single/ -cmake -DCMAKE_INSTALL_PREFIX=$prefix/single -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DDFLOAT=1 .. -cmake --build . -j8 +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TARGET_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release .. +cmake --build . make install """ @@ -33,8 +27,7 @@ platforms = supported_platforms() # The products that we will ensure are always built products = [ - LibraryProduct("libqdldl", :libqdldl64, "double/lib"), - LibraryProduct("libqdldl", :libqdldl32, "single/lib") + LibraryProduct("libqdldl", :libqdldl) ] # Dependencies that must be installed before this package can be built From adc6363662c01731fac01ec2a31b862ce98bfad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= Date: Wed, 26 Jan 2022 20:45:52 +0000 Subject: [PATCH 3/3] [QDLDL] Rename from `qdldl` to match styling of upstream project --- Q/{qdldl => QDLDL}/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename Q/{qdldl => QDLDL}/build_tarballs.jl (98%) diff --git a/Q/qdldl/build_tarballs.jl b/Q/QDLDL/build_tarballs.jl similarity index 98% rename from Q/qdldl/build_tarballs.jl rename to Q/QDLDL/build_tarballs.jl index 12c56153caa..24ce836cb59 100644 --- a/Q/qdldl/build_tarballs.jl +++ b/Q/QDLDL/build_tarballs.jl @@ -2,7 +2,7 @@ # `julia build_tarballs.jl --help` to see a usage message. using BinaryBuilder, Pkg -name = "qdldl" +name = "QDLDL" version = v"0.1.5" # Collection of sources required to complete build