From 66353b8012284ad3878a151915d6ceebb4a1ea08 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 8 Aug 2019 16:58:53 -0600
Subject: [PATCH] neverball: Build sol files and install to /games/neverball
---
recipes/neverball/recipe.sh | 11 +++++++++--
recipes/neverball/redox.patch | 15 ---------------
2 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/recipes/neverball/recipe.sh b/recipes/neverball/recipe.sh
index e58f1a1ec..3e16482b6 100644
--- a/recipes/neverball/recipe.sh
+++ b/recipes/neverball/recipe.sh
@@ -13,10 +13,12 @@ function recipe_update {
}
function recipe_build {
+ env -i PATH=/usr/bin:/bin PKG_CONFIG=pkg-config \
+ make -j"$(nproc)" ENABLE_FS=stdio mapc sols
sysroot="$(realpath ../sysroot)"
export CPPFLAGS="-I$sysroot/include"
export LDFLAGS="-L$sysroot/lib -static"
- #TODO: Make sol using host compiler
+ make -j"$(nproc)" ENABLE_FS=stdio ENABLE_NLS=0 clean-src
make -j"$(nproc)" ENABLE_FS=stdio ENABLE_NLS=0 neverball neverputt
skip=1
}
@@ -33,6 +35,11 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
- make DESTDIR="$dest" install
+ mkdir -p "${dest}/games"
+ cp -rv data "${dest}/games/neverball"
+ for bin in neverball neverputt
+ do
+ "${STRIP}" -v "$bin" -o "${dest}/games/neverball/$bin"
+ done
skip=1
}
diff --git a/recipes/neverball/redox.patch b/recipes/neverball/redox.patch
index fe2824aec..50a79c4fc 100644
--- a/recipes/neverball/redox.patch
+++ b/recipes/neverball/redox.patch
@@ -73,18 +73,3 @@ diff -ruwN source/Makefile source-new/Makefile
$(BALL_TARG) : $(BALL_OBJS)
$(LINK) -o $(BALL_TARG) $(BALL_OBJS) $(LDFLAGS) $(ALL_LIBS)
-diff -ruwN source/share/version.h source-new/share/version.h
---- source/share/version.h 2019-08-07 22:43:26.197100463 -0600
-+++ source-new/share/version.h 1969-12-31 17:00:00.000000000 -0700
-@@ -1,6 +0,0 @@
--#ifndef VERSION_H
--#define VERSION_H
--
--#define VERSION "1.6.0"
--
--#endif
-diff -ruwN source/.version source-new/.version
---- source/.version 2019-08-07 22:43:26.197100463 -0600
-+++ source-new/.version 1969-12-31 17:00:00.000000000 -0700
-@@ -1 +0,0 @@
--1.6.0
--
GitLab