From 99f7948c73919d6bc33fada2d9c1d3b7a79d0d91 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Wed, 14 Jul 2021 13:08:30 -0600
Subject: [PATCH] Fix glutin package build

---
 recipes/glutin/recipe.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/recipes/glutin/recipe.sh b/recipes/glutin/recipe.sh
index bd2beb51d..459e21539 100644
--- a/recipes/glutin/recipe.sh
+++ b/recipes/glutin/recipe.sh
@@ -6,12 +6,11 @@ CARGOFLAGS="--example window"
 
 function recipe_build {
     sysroot="$(realpath ../sysroot)"
-    cp -p "$ROOT/Xargo.toml" "Xargo.toml"
     set -x
-    xargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
+    cargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
         -- \
         -L "${sysroot}/lib" \
-        -C link-args="$("${PKG_CONFIG}" --libs osmesa) -lglapi -lz -lstdc++ -lc -lgcc"
+        -C link-args="-Wl,-Bstatic $("${PKG_CONFIG}" --libs osmesa) -lstdc++ -lc -lgcc"
     set +x
     skip=1
 }
-- 
GitLab