From 66854008dbdbb2f7e851c23e9e2252477dcb9474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <giordano@users.noreply.github.com>
Date: Sat, 20 May 2023 18:50:17 +0100
Subject: [PATCH] [TVM] [libmodplug] Trigger regeneration of JLLs (#6773)

[skip build]
---
 L/libmodplug/build_tarballs.jl |  8 +++++---
 T/TVM/build_tarballs.jl        | 26 +++++++++++++-------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/L/libmodplug/build_tarballs.jl b/L/libmodplug/build_tarballs.jl
index 555ab3ee077..b628d30cc70 100644
--- a/L/libmodplug/build_tarballs.jl
+++ b/L/libmodplug/build_tarballs.jl
@@ -7,13 +7,14 @@ version = v"0.8.9"
 
 # Collection of sources required to build libmodplug
 sources = [
-    "https://downloads.sourceforge.net/modplug-xmms/libmodplug-$(version).0.tar.gz" =>
-    "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de",
+    ArchiveSource("https://downloads.sourceforge.net/modplug-xmms/libmodplug-$(version).0.tar.gz",
+                  "457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de"),
 ]
 
 # Bash recipe for building across all platforms
 script = raw"""
 cd $WORKSPACE/srcdir/libmodplug-*/
+sed -i 's/-ffast-math//g' configure # This should be a real patch, but `sed` is quicker
 ./configure --prefix=${prefix} --build=${MACHTYPE} --host=${target}
 make -j${nproc}
 make install
@@ -22,6 +23,7 @@ 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()
+filter!(p->arch(p) != "armv6l" && !(Sys.isapple(p) && arch(p) == "aarch64"), platforms)
 
 # The products that we will ensure are always built
 products = [
@@ -29,7 +31,7 @@ products = [
 ]
 
 # Dependencies that must be installed before this package can be built
-dependencies = [
+dependencies = Dependency[
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
diff --git a/T/TVM/build_tarballs.jl b/T/TVM/build_tarballs.jl
index deb609fceeb..cf3abecf1a4 100644
--- a/T/TVM/build_tarballs.jl
+++ b/T/TVM/build_tarballs.jl
@@ -6,16 +6,16 @@ name = "TVM"
 version = v"0.5"
 
 sources = [
-    "https://github.com/dmlc/tvm.git" =>
-    "f08015e7fde92c835907d4c9b7ad6d3f634e94a5",
-    "https://github.com/dmlc/dlpack.git" =>
-    "0acb731e0e43d15deee27b66f10e4c5b4e667913",
-    "https://github.com/dmlc/dmlc-core.git" =>
-    "808f485387f9a03f78fa9f1159f387d0d91b7a28",
-    "https://github.com/agauniyal/rang.git" =>
-    "cabe04d6d6b05356fa8f9741704924788f0dd762",
-    "https://github.com/dmlc/HalideIR.git" =>
-    "b257a9221ee1e5180d994b3488ddcc259b0ac157",
+    GitSource("https://github.com/dmlc/tvm.git",
+              "f08015e7fde92c835907d4c9b7ad6d3f634e94a5"),
+    GitSource("https://github.com/dmlc/dlpack.git",
+              "0acb731e0e43d15deee27b66f10e4c5b4e667913"),
+    GitSource("https://github.com/dmlc/dmlc-core.git",
+              "808f485387f9a03f78fa9f1159f387d0d91b7a28"),
+    GitSource("https://github.com/agauniyal/rang.git",
+              "cabe04d6d6b05356fa8f9741704924788f0dd762"),
+    GitSource("https://github.com/dmlc/HalideIR.git",
+              "b257a9221ee1e5180d994b3488ddcc259b0ac157"),
 ]
 
 # Bash recipe for building across all platforms
@@ -51,7 +51,7 @@ platforms = [
 ]
 
 # The products that we will ensure are always built
-products = Product[
+products = [
     LibraryProduct("libtvm", :libtvm),
     LibraryProduct("libtvm_topi", :libtvm_topi),
     LibraryProduct("libtvm_runtime", :libtvm_runtime),
@@ -60,8 +60,8 @@ products = Product[
 
 # Dependencies that must be installed before this package can be built
 dependencies = [
-    "Zlib_jll",
-    "LLVM_jll",
+    Dependency("Zlib_jll"),
+    Dependency("LLVM_jll"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.