From b89624953039f34b32b98b9cc72be4f05be13a87 Mon Sep 17 00:00:00 2001
From: Julian P Samaroo <jpsamaroo@jpsamaroo.me>
Date: Mon, 28 Sep 2020 17:35:18 -0500
Subject: [PATCH 1/3] Libglvnd: Disable initial-exec TLS model for musl

---
 L/Libglvnd/build_tarballs.jl | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/L/Libglvnd/build_tarballs.jl b/L/Libglvnd/build_tarballs.jl
index c3c544bba57..3697383ce98 100644
--- a/L/Libglvnd/build_tarballs.jl
+++ b/L/Libglvnd/build_tarballs.jl
@@ -15,7 +15,11 @@ sources = [
 script = raw"""
 cd $WORKSPACE/srcdir/libglvnd-*/
 export CPPFLAGS="-I${prefix}/include"
+if [[ "${target}" == *musl* ]]; then
+./configure --prefix=${prefix} --host=${target} --disable-tls
+else
 ./configure --prefix=${prefix} --host=${target}
+fi
 make -j${nproc}
 make install
 # The license is embedded in the README file

From 49747cfa1a68f0dfe24b5c4fdd30ed47badc13f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <mose@gnu.org>
Date: Mon, 28 Sep 2020 23:44:46 +0100
Subject: [PATCH 2/3] [Libglvnd] Fix platforms filtering

---
 L/Libglvnd/build_tarballs.jl | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/L/Libglvnd/build_tarballs.jl b/L/Libglvnd/build_tarballs.jl
index 3697383ce98..5457096c44d 100644
--- a/L/Libglvnd/build_tarballs.jl
+++ b/L/Libglvnd/build_tarballs.jl
@@ -15,11 +15,11 @@ sources = [
 script = raw"""
 cd $WORKSPACE/srcdir/libglvnd-*/
 export CPPFLAGS="-I${prefix}/include"
+FLAGS=()
 if [[ "${target}" == *musl* ]]; then
-./configure --prefix=${prefix} --host=${target} --disable-tls
-else
-./configure --prefix=${prefix} --host=${target}
+    FLAGS=(--disable-tls)
 fi
+./configure --prefix=${prefix} --host=${target} "${FLAGS[@]}"
 make -j${nproc}
 make install
 # The license is embedded in the README file
@@ -28,7 +28,7 @@ install_license README.md
 
 # These are the platforms we will build for by default, unless further
 # platforms are passed in on the command line
-platforms = [p for p in supported_platforms() if p isa Union{Linux,FreeBSD}]
+platforms = filter!(p ->Sys.islinux(p) || Sys.isfreebsd(p), supported_platforms())
 
 # The products that we will ensure are always built
 products = Product[
@@ -50,4 +50,3 @@ dependencies = [
 
 # Build the tarballs.
 build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies)
-

From e0366f63b6f2fa941badbcee3313ebb9e46854b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <mose@gnu.org>
Date: Tue, 29 Sep 2020 00:29:25 +0100
Subject: [PATCH 3/3] [Libglvnd] Add `Xorg_xorgproto_jll` as build dependency

---
 L/Libglvnd/build_tarballs.jl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/L/Libglvnd/build_tarballs.jl b/L/Libglvnd/build_tarballs.jl
index 5457096c44d..da3497ac8cc 100644
--- a/L/Libglvnd/build_tarballs.jl
+++ b/L/Libglvnd/build_tarballs.jl
@@ -14,7 +14,7 @@ sources = [
 # Bash recipe for building across all platforms
 script = raw"""
 cd $WORKSPACE/srcdir/libglvnd-*/
-export CPPFLAGS="-I${prefix}/include"
+export CPPFLAGS="-I${includedir}"
 FLAGS=()
 if [[ "${target}" == *musl* ]]; then
     FLAGS=(--disable-tls)
@@ -45,7 +45,7 @@ products = Product[
 dependencies = [
     Dependency("Xorg_libX11_jll"),
     Dependency("Xorg_libXext_jll"),
-    BuildDependency("Xorg_glproto_jll"),
+    BuildDependency("Xorg_xorgproto_jll"),
 ]
 
 # Build the tarballs.