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
96e276d0
Commit
96e276d0
authored
7 years ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Fix pkgutils build
parent
0b2585a5
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
config.sh
+0
-1
0 additions, 1 deletion
config.sh
cook.sh
+1
-1
1 addition, 1 deletion
cook.sh
recipes/lua/recipe.sh
+3
-1
3 additions, 1 deletion
recipes/lua/recipe.sh
recipes/newlib/recipe.sh
+0
-2
0 additions, 2 deletions
recipes/newlib/recipe.sh
with
4 additions
and
5 deletions
config.sh
+
0
−
1
View file @
96e276d0
...
@@ -7,4 +7,3 @@ export TARGET=x86_64-unknown-redox
...
@@ -7,4 +7,3 @@ export TARGET=x86_64-unknown-redox
# Automatic variables
# Automatic variables
ROOT
=
"
$(
cd
`
dirname
"
$0
"
`
&&
pwd
)
"
ROOT
=
"
$(
cd
`
dirname
"
$0
"
`
&&
pwd
)
"
REPO
=
"
$ROOT
/repo/
$TARGET
"
REPO
=
"
$ROOT
/repo/
$TARGET
"
export
CC
=
"x86_64-elf-redox-gcc"
This diff is collapsed.
Click to expand it.
cook.sh
+
1
−
1
View file @
96e276d0
...
@@ -200,7 +200,7 @@ function op {
...
@@ -200,7 +200,7 @@ function op {
echo
"target =
\"
$TARGET
\"
"
>>
"stage.toml"
echo
"target =
\"
$TARGET
\"
"
>>
"stage.toml"
mkdir
-p
stage/pkg
mkdir
-p
stage/pkg
cp
-v
stage.toml
"stage/pkg/
$1
.toml"
cp
-v
stage.toml
"stage/pkg/
$1
.toml"
TARGET
=
x86_64-unknown-redox
cargo run
--release
--manifest-path
"
$ROOT
/pkgutils/Cargo.toml"
--bin
pkg
--
create stage
cargo run
--release
--manifest-path
"
$ROOT
/pkgutils/Cargo.toml"
--bin
pkg
--
create stage
;;
;;
untar
)
untar
)
rm
-rfv
stage.tar stage.sig stage.toml
rm
-rfv
stage.tar stage.sig stage.toml
...
...
This diff is collapsed.
Click to expand it.
recipes/lua/recipe.sh
+
3
−
1
View file @
96e276d0
VERSION
=
5.3.1
VERSION
=
5.3.1
TAR
=
http://www.lua.org/ftp/lua-
$VERSION
.tar.gz
TAR
=
http://www.lua.org/ftp/lua-
$VERSION
.tar.gz
HOST
=
x86_64-elf-redox
function
recipe_version
{
function
recipe_version
{
echo
"
$VERSION
"
echo
"
$VERSION
"
return
1
return
1
...
@@ -12,7 +14,7 @@ function recipe_update {
...
@@ -12,7 +14,7 @@ function recipe_update {
}
}
function
recipe_build
{
function
recipe_build
{
make generic
CC
=
"
$
CC
-std=gnu99"
make generic
CC
=
"
$
{
HOST
}
-gcc
-std=gnu99"
return
1
return
1
}
}
...
...
This diff is collapsed.
Click to expand it.
recipes/newlib/recipe.sh
+
0
−
2
View file @
96e276d0
GIT
=
https://github.com/redox-os/newlib.git
GIT
=
https://github.com/redox-os/newlib.git
BRANCH
=
redox
BRANCH
=
redox
CC
=
HOST
=
x86_64-elf-redox
HOST
=
x86_64-elf-redox
function
recipe_version
{
function
recipe_version
{
...
...
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