From 5df67123ce541ff07e3a49281c6202cbe3a08fec Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Wed, 7 Dec 2022 22:35:32 -0700
Subject: [PATCH] Do not require mesa for iced and libcosmic
---
recipes/iced/recipe.toml | 15 ++-------------
recipes/libcosmic/recipe.toml | 12 ++----------
2 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/recipes/iced/recipe.toml b/recipes/iced/recipe.toml
index c92d017f7..447f93d5f 100644
--- a/recipes/iced/recipe.toml
+++ b/recipes/iced/recipe.toml
@@ -4,28 +4,17 @@ branch = "redox"
[build]
template = "custom"
-dependencies = [
- "llvm",
- "mesa",
- "zlib"
-]
script = """
EXAMPLES=(
- game_of_life
- solar_system
styling
- tour
)
set -x
for example in "${EXAMPLES[@]}"
do
- ${COOKBOOK_CARGO} rustc \
+ ${COOKBOOK_CARGO} build \
--release \
--manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
- --package "${example}" \
- -- \
- -L "${COOKBOOK_SYSROOT}/lib" \
- -C link-args="-Wl,-Bstatic $("${TARGET}-pkg-config" --libs osmesa) -lz -lstdc++ -lc -lgcc"
+ --package "${example}"
mkdir -pv "${COOKBOOK_STAGE}/bin"
cp -v "target/${TARGET}/release/${example}" "${COOKBOOK_STAGE}/bin/iced_${example}"
done
diff --git a/recipes/libcosmic/recipe.toml b/recipes/libcosmic/recipe.toml
index 426d7619a..3832b9f98 100644
--- a/recipes/libcosmic/recipe.toml
+++ b/recipes/libcosmic/recipe.toml
@@ -4,20 +4,12 @@ branch = "redox"
[build]
template = "custom"
-dependencies = [
- "llvm",
- "mesa",
- "zlib"
-]
script = """
set -x
- ${COOKBOOK_CARGO} rustc \
+ ${COOKBOOK_CARGO} build \
--release \
--manifest-path "${COOKBOOK_SOURCE}/Cargo.toml" \
- --package cosmic \
- -- \
- -L "${COOKBOOK_SYSROOT}/lib" \
- -C link-args="-Wl,-Bstatic $("${PKG_CONFIG}" --libs osmesa) -lz -lstdc++ -lc -lgcc"
+ --package cosmic
mkdir -pv "${COOKBOOK_STAGE}/bin"
cp -v "target/${TARGET}/release/cosmic" "${COOKBOOK_STAGE}/bin/libcosmic"
"""
--
GitLab