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
00608506
Verified
Commit
00608506
authored
1 year ago
by
Jeremy Soller
Browse files
Options
Downloads
Patches
Plain Diff
Fix neverball recipe
parent
01326500
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
recipes/neverball/recipe.sh
+7
-2
7 additions, 2 deletions
recipes/neverball/recipe.sh
recipes/neverball/redox.patch
+15
-3
15 additions, 3 deletions
recipes/neverball/redox.patch
with
22 additions
and
5 deletions
recipes/neverball/recipe.sh
+
7
−
2
View file @
00608506
...
@@ -8,13 +8,18 @@ function recipe_version {
...
@@ -8,13 +8,18 @@ function recipe_version {
}
}
function
recipe_build
{
function
recipe_build
{
env
-i
PATH
=
/usr/bin:/bin
PKG_CONFIG
=
pkg-config
\
set
-x
env
-i
\
LDFLAGS
=
"-static"
\
PATH
=
"/usr/bin:/bin"
\
PKG_CONFIG
=
"pkg-config"
\
"
$REDOX_MAKE
"
-j
"
$(
$NPROC
)
"
ENABLE_FS
=
stdio mapc sols
"
$REDOX_MAKE
"
-j
"
$(
$NPROC
)
"
ENABLE_FS
=
stdio mapc sols
sysroot
=
"
$(
realpath
../sysroot
)
"
sysroot
=
"
$(
realpath
../sysroot
)
"
export
CPPFLAGS
=
"-I
$sysroot
/include"
export
CPPFLAGS
=
"-I
$sysroot
/include"
export
LDFLAGS
=
"-L
$sysroot
/lib -static"
export
LDFLAGS
=
"-L
$sysroot
/lib -static
-z noexecstack
"
"
$REDOX_MAKE
"
-j
"
$(
$NPROC
)
"
ENABLE_FS
=
stdio
ENABLE_NLS
=
0 clean-src
"
$REDOX_MAKE
"
-j
"
$(
$NPROC
)
"
ENABLE_FS
=
stdio
ENABLE_NLS
=
0 clean-src
"
$REDOX_MAKE
"
-j
"
$(
$NPROC
)
"
ENABLE_FS
=
stdio
ENABLE_NLS
=
0 neverball neverputt
"
$REDOX_MAKE
"
-j
"
$(
$NPROC
)
"
ENABLE_FS
=
stdio
ENABLE_NLS
=
0 neverball neverputt
set
+x
skip
=
1
skip
=
1
}
}
...
...
This diff is collapsed.
Click to expand it.
recipes/neverball/redox.patch
+
15
−
3
View file @
00608506
diff -ruwN
source
/Makefile source
-new
/Makefile
diff -ruwN
neverball-1.6.0
/Makefile source/Makefile
---
source
/Makefile 201
9
-0
8-07 22:16:07.630185664
-0600
---
neverball-1.6.0
/Makefile 201
4
-0
5-21 07:21:43.000000000
-0600
+++ source
-new
/Makefile 20
19
-0
8
-09 2
1:41:20.2969425
96 -0600
+++ source/Makefile 20
23
-0
9
-09 2
0:03:22.113348
96
3
-0600
@@ -38,11 +38,11 @@
@@ -38,11 +38,11 @@
ifeq ($(DEBUG),1)
ifeq ($(DEBUG),1)
CFLAGS := -g
CFLAGS := -g
...
@@ -73,3 +73,15 @@ diff -ruwN source/Makefile source-new/Makefile
...
@@ -73,3 +73,15 @@ diff -ruwN source/Makefile source-new/Makefile
$(BALL_TARG) : $(BALL_OBJS)
$(BALL_TARG) : $(BALL_OBJS)
$(LINK) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
$(LINK) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
diff -ruwN neverball-1.6.0/share/text.h source/share/text.h
--- neverball-1.6.0/share/text.h 2014-05-21 07:21:43.000000000 -0600
+++ source/share/text.h 2023-09-09 20:02:10.117248865 -0600
@@ -15,7 +15,7 @@
/*---------------------------------------------------------------------------*/
-char text_input[MAXSTR];
+extern char text_input[MAXSTR];
void text_input_start(void (*cb)(int typing));
void text_input_stop(void);
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