From 1808332130aff51d977bdddda1e998c83e8defd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <giordano@users.noreply.github.com>
Date: Sun, 6 Mar 2022 18:12:35 +0000
Subject: [PATCH] Rename `/usr/share/licenses/GPL3` to `GPL-3.0+` (#4558)

After https://github.com/JuliaPackaging/Yggdrasil/pull/4551 some license files
were renamed to have a more descriptive name, the license text didn't change.

[skip ci] [skip build]
---
 D/Deldir/build_tarballs.jl                 | 4 +++-
 G/GAP_pkg/GAP_pkg_browse/build_tarballs.jl | 2 +-
 H/HiGHS/highs_common.jl                    | 2 +-
 I/IGLWrap/build_tarballs.jl                | 2 +-
 O/Objconv/build_tarballs.jl                | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/D/Deldir/build_tarballs.jl b/D/Deldir/build_tarballs.jl
index 5f658f94f43..7b87e3cb88d 100644
--- a/D/Deldir/build_tarballs.jl
+++ b/D/Deldir/build_tarballs.jl
@@ -21,12 +21,14 @@ done
 mkdir -p "${libdir}"
 ${CC} -shared -o ${libdir}/libdeldir.${dlext} *.o
 
-install_license /usr/share/licenses/GPL3
+install_license /usr/share/licenses/GPL-3.0+
 """
 
 # These are the platforms we will build for by default, unless further
 # platforms are passed in on the command line
 platforms = supported_platforms()
+# Filter out previously experimental platforms until we do a new build
+filter!(p -> arch(p) != "armv6l" && !(Sys.isapple(p) && arch(p) == "aarch64"), platforms)
 
 # The products that we will ensure are always built
 products = [
diff --git a/G/GAP_pkg/GAP_pkg_browse/build_tarballs.jl b/G/GAP_pkg/GAP_pkg_browse/build_tarballs.jl
index 7ba913e9374..f83b6ff2692 100644
--- a/G/GAP_pkg/GAP_pkg_browse/build_tarballs.jl
+++ b/G/GAP_pkg/GAP_pkg_browse/build_tarballs.jl
@@ -26,7 +26,7 @@ make -j${nproc} CFLAGS="-I$includedir -I$includedir/ncurses"
 mkdir -p ${prefix}/lib/gap
 cp bin/*/*.so ${prefix}/lib/gap/
 
-install_license /usr/share/licenses/GPL3
+install_license /usr/share/licenses/GPL-3.0+
 """
 
 name = gap_pkg_name(name)
diff --git a/H/HiGHS/highs_common.jl b/H/HiGHS/highs_common.jl
index 2ae760e328e..a543d76aa2d 100644
--- a/H/HiGHS/highs_common.jl
+++ b/H/HiGHS/highs_common.jl
@@ -54,7 +54,7 @@ if [[ "${BUILD_SHARED}" == "OFF" ]]; then
     rm -r ${prefix}/lib
     if [[ "${target}" == *-mingw* ]]; then
         # The Windows build ships also GCC runtime, add its license as well
-        install_license /usr/share/licenses/GPL3
+        install_license /usr/share/licenses/GPL-3.0+
     fi
 fi
 """
diff --git a/I/IGLWrap/build_tarballs.jl b/I/IGLWrap/build_tarballs.jl
index 62118963416..98024357f61 100644
--- a/I/IGLWrap/build_tarballs.jl
+++ b/I/IGLWrap/build_tarballs.jl
@@ -28,7 +28,7 @@ cmake \
     ..
 make -j${nproc}
 make install
-install_license /usr/share/licenses/GPL3
+install_license /usr/share/licenses/GPL-3.0+
 """
 
 products = [
diff --git a/O/Objconv/build_tarballs.jl b/O/Objconv/build_tarballs.jl
index e7c2f52842a..e7ce92610ec 100644
--- a/O/Objconv/build_tarballs.jl
+++ b/O/Objconv/build_tarballs.jl
@@ -18,7 +18,7 @@ cd $WORKSPACE/srcdir/objconv*/
 mkdir -p ${prefix}/bin
 ${CXX} ${CPPFLAGS} ${CXXFLAGS} ${LDFLAGS} -O2 -o ${prefix}/bin/objconv${exeext} src/*.cpp
 
-install_license /usr/share/licenses/GPL3
+install_license /usr/share/licenses/GPL-3.0+
 """
 
 # These are the platforms we will build for by default, unless further