From a792793b92e9a77d72fd3337215d26876a64daed Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Sun, 30 Dec 2018 11:16:28 -0700
Subject: [PATCH] Update install paths for some recipes that compile examples,
add zlib to recipes that use mesa
---
recipes/glutin/recipe.sh | 10 +++++++++-
recipes/hematite/recipe.sh | 3 ++-
recipes/rust-cairo/recipe.sh | 8 +++++++-
recipes/winit/recipe.sh | 7 +++++++
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/recipes/glutin/recipe.sh b/recipes/glutin/recipe.sh
index 9e2a08af8..fe95257fb 100644
--- a/recipes/glutin/recipe.sh
+++ b/recipes/glutin/recipe.sh
@@ -1,6 +1,6 @@
GIT=https://gitlab.redox-os.org/redox-os/glutin.git
GIT_UPSTREAM=https://github.com/tomaka/glutin.git
-BUILD_DEPENDS=(mesa)
+BUILD_DEPENDS=(mesa zlib)
BRANCH=redox
CARGOFLAGS="--example window"
@@ -12,7 +12,15 @@ function recipe_build {
-L "${sysroot}/lib" \
-l OSMesa \
-l glapi \
+ -l z \
-l stdc++ \
-C link-args="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
skip=1
}
+
+function recipe_stage {
+ dest="$(realpath $1)"
+ mkdir -pv "$dest/bin"
+ cp -v "target/${TARGET}/release/examples/window" "$dest/bin/glutin"
+ skip=1
+}
diff --git a/recipes/hematite/recipe.sh b/recipes/hematite/recipe.sh
index 1eac2e09a..077664969 100644
--- a/recipes/hematite/recipe.sh
+++ b/recipes/hematite/recipe.sh
@@ -1,6 +1,6 @@
GIT=https://gitlab.redox-os.org/redox-os/hematite.git
GIT_UPSTREAM=https://github.com/PistonDevelopers/hematite.git
-BUILD_DEPENDS=(mesa)
+BUILD_DEPENDS=(mesa zlib)
BRANCH=redox
function recipe_build {
@@ -11,6 +11,7 @@ function recipe_build {
-L "${sysroot}/lib" \
-l OSMesa \
-l glapi \
+ -l z \
-l stdc++ \
-C link-args="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
skip=1
diff --git a/recipes/rust-cairo/recipe.sh b/recipes/rust-cairo/recipe.sh
index 345db4c83..f2fea6aae 100644
--- a/recipes/rust-cairo/recipe.sh
+++ b/recipes/rust-cairo/recipe.sh
@@ -12,7 +12,13 @@ function recipe_build {
-l pixman-1 \
-l freetype \
-l png \
- -l z
+ -l z
skip=1
}
+function recipe_stage {
+ dest="$(realpath $1)"
+ mkdir -pv "$dest/bin"
+ cp -v "target/${TARGET}/release/examples/gui" "$dest/bin/rust-cairo"
+ skip=1
+}
diff --git a/recipes/winit/recipe.sh b/recipes/winit/recipe.sh
index eaa6196bb..8f18b82ca 100644
--- a/recipes/winit/recipe.sh
+++ b/recipes/winit/recipe.sh
@@ -2,3 +2,10 @@ GIT=https://gitlab.redox-os.org/redox-os/winit.git
GIT_UPSTREAM=https://github.com/tomaka/winit.git
BRANCH=redox
CARGOFLAGS="--example window"
+
+function recipe_stage {
+ dest="$(realpath $1)"
+ mkdir -pv "$dest/bin"
+ cp -v "target/${TARGET}/release/examples/window" "$dest/bin/winit"
+ skip=1
+}
--
GitLab