MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-24 05:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prepare for use of llvmpipe

Browse Source
This commit is contained in:
Jeremy Soller 2019-01-05 10:26:23 -07:00
parent c44ee8ef19
commit bc611cf36e
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
recipes/cargo/recipe.sh
View File

@ -1,9 +1,11 @@
GIT=https://gitlab.redox-os.org/redox-os/cargo.git
GIT_UPSTREAM=https://github.com/rust-lang/cargo.git
BRANCH=redox
BUILD_DEPENDS=(openssl zlib)
function recipe_build {
export DEP_OPENSSL_ROOT="$PWD/../sysroot"
export OPENSSL_DIR="$PWD/../sysroot"
export DEP_Z_ROOT="$PWD/../sysroot"
sysroot="$(realpath ../sysroot)"
export DEP_OPENSSL_ROOT="$sysroot"
export OPENSSL_DIR="$sysroot"
export DEP_Z_ROOT="$sysroot"
}

4
recipes/gears/recipe.sh
View File

@ -1,4 +1,4 @@
BUILD_DEPENDS=(liborbital mesa mesa_glu zlib)
BUILD_DEPENDS=(liborbital llvm mesa mesa_glu zlib)
function recipe_version {
printf "1.0.0"
@ -19,7 +19,7 @@ function recipe_prepare {
function recipe_build {
sysroot="$(realpath ../sysroot)"
set -x
"${CXX}" -I "$sysroot/include" -L "$sysroot/lib" gears.c -o gears -lorbital $("${PKG_CONFIG}" --libs glu) -lglapi -lz -Wl,--whole-archive -lpthread -Wl,--no-whole-archive
"${CXX}" -O2 -I "$sysroot/include" -L "$sysroot/lib" gears.c -o gears -lorbital $("${PKG_CONFIG}" --libs glu) -lglapi -lz
set +x
skip=1
}

10
recipes/hematite/recipe.sh
View File

@ -1,18 +1,16 @@
GIT=https://gitlab.redox-os.org/redox-os/hematite.git
GIT_UPSTREAM=https://github.com/PistonDevelopers/hematite.git
BUILD_DEPENDS=(mesa zlib)
BUILD_DEPENDS=(mesa llvm zlib)
BRANCH=redox
function recipe_build {
sysroot="$(realpath ../sysroot)"
cp -p "$ROOT/Xargo.toml" "Xargo.toml"
set -x
xargo rustc --target "$TARGET" --release ${CARGOFLAGS} \
-- \
-L "${sysroot}/lib" \
-l OSMesa \
-l glapi \
-l z \
-l stdc++ \
-C link-args="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
-C link-args="$("${PKG_CONFIG}" --libs osmesa) -lglapi -lz -lstdc++ -lc -lgcc"
set +x
skip=1
}