Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
cookbook
Commits
a58b49d3
Verified
Commit
a58b49d3
authored
6 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Fixes for mesa and gears recipes
parent
7be5394d
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
recipes/gears/recipe.sh
+2
-2
2 additions, 2 deletions
recipes/gears/recipe.sh
recipes/mesa/recipe.sh
+5
-5
5 additions, 5 deletions
recipes/mesa/recipe.sh
with
7 additions
and
7 deletions
recipes/gears/recipe.sh
+
2
−
2
View file @
a58b49d3
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
}
...
...
This diff is collapsed.
Click to expand it.
recipes/mesa/recipe.sh
+
5
−
5
View file @
a58b49d3
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
\
--
en
able-llvm
\
--
dis
able-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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment