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

Fixes for mesa and gears recipes

Browse Source
This commit is contained in:
Jeremy Soller 2018-12-22 17:20:30 -07:00
parent 7be5394da7
commit a58b49d363
No known key found for this signature in database
GPG Key ID: E988B49EE78A7FB1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes/gears/recipe.sh
View File

@ -1,4 +1,4 @@
BUILD_DEPENDS=(liborbital llvm mesa mesa_glu)
BUILD_DEPENDS=(liborbital 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)
"${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
set +x
skip=1
}

10
recipes/mesa/recipe.sh
View File

@ -1,7 +1,7 @@
GIT=https://gitlab.redox-os.org/redox-os/mesa.git
GIT_UPSTREAM=git://anongit.freedesktop.org/mesa/mesa
GIT_BRANCH=redox
BUILD_DEPENDS=(expat llvm zlib)
BUILD_DEPENDS=(expat zlib)
function recipe_version {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
@ -19,8 +19,8 @@ function recipe_build {
export CPPFLAGS="-I$sysroot/include -DHAVE_PTHREAD=1"
export LDFLAGS="-L$sysroot/lib"
export LIBS="-Wl,--whole-archive -lpthread -Wl,--no-whole-archive"
export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
#NOCONFIGURE=1 ./autogen.sh
#export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
NOCONFIGURE=1 ./autogen.sh
./configure \
--host="${HOST}" \
--prefix=/ \
@ -31,7 +31,7 @@ function recipe_build {
--disable-glx \
--disable-gbm \
--disable-llvm-shared-libs \
--enable-llvm \
--disable-llvm \
--enable-gallium-osmesa \
--with-gallium-drivers=swrast \
--with-platforms=surfaceless
@ -50,7 +50,7 @@ function recipe_clean {
}
function recipe_stage {
export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
#export LLVM_CONFIG="x86_64-unknown-redox-llvm-config"
dest="$(realpath $1)"
make DESTDIR="$dest" install
rm -f "$dest/lib/"*.la