Do not require mesa for iced and libcosmic

This commit is contained in:
Jeremy Soller 2022-12-07 22:35:32 -07:00
parent 7aa519b04c
commit 5df67123ce
2 changed files with 4 additions and 23 deletions

View File

@ -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

View File

@ -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"
"""