Skip to content
Snippets Groups Projects
Verified Commit a58b49d3 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Fixes for mesa and gears recipes

parent 7be5394d
No related branches found
No related tags found
No related merge requests found
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
}
......
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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment