From f4b46490ffb9b1a53827591598dd15a68fbf5e06 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 10 Dec 2018 13:40:22 -0700
Subject: [PATCH] Do not remove sdl-config
---
recipes/prboom/recipe.sh | 3 ++-
recipes/sdl/recipe.sh | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/recipes/prboom/recipe.sh b/recipes/prboom/recipe.sh
index 95ac19249..6f3a5a026 100644
--- a/recipes/prboom/recipe.sh
+++ b/recipes/prboom/recipe.sh
@@ -13,9 +13,10 @@ function recipe_update {
}
function recipe_build {
+ sysroot="$(realpath ../sysroot)"
autoreconf -if
wget -O autotools/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
- ./configure --prefix=/ --host=${HOST} --disable-sdltest --disable-cpu-opt --disable-gl --without-net --with-sdl-prefix="$PWD/../sysroot"
+ ./configure --prefix=/ --host=${HOST} --disable-sdltest --disable-cpu-opt --disable-gl --without-net --with-sdl-prefix="$sysroot"
make -j"$(nproc)"
skip=1
}
diff --git a/recipes/sdl/recipe.sh b/recipes/sdl/recipe.sh
index 375ac7775..8d762a0d3 100644
--- a/recipes/sdl/recipe.sh
+++ b/recipes/sdl/recipe.sh
@@ -46,6 +46,6 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install
- rm -f "$dest/bin/"*-config "$dest/lib/"*.la
+ rm -f "$dest/lib/"*.la
skip=1
}
--
GitLab