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

Fix neverball recipe

parent 01326500
No related branches found
No related tags found
No related merge requests found
...@@ -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
} }
......
diff -ruwN source/Makefile source-new/Makefile diff -ruwN neverball-1.6.0/Makefile source/Makefile
--- source/Makefile 2019-08-07 22:16:07.630185664 -0600 --- neverball-1.6.0/Makefile 2014-05-21 07:21:43.000000000 -0600
+++ source-new/Makefile 2019-08-09 21:41:20.296942596 -0600 +++ source/Makefile 2023-09-09 20:03:22.113348963 -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);
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