From cb6e329030ea78b0cacfc21f3d8e16432e2f0308 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 10 Dec 2018 13:18:10 -0700
Subject: [PATCH] Recipe cleanups
---
recipes/dash/recipe.sh | 2 +-
recipes/diffutils/recipe.sh | 4 ++--
recipes/freeciv/recipe.sh | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/recipes/dash/recipe.sh b/recipes/dash/recipe.sh
index 8a98fb4f4..fa1296ccc 100644
--- a/recipes/dash/recipe.sh
+++ b/recipes/dash/recipe.sh
@@ -31,6 +31,6 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install
- ln -s "dash" "$1/bin/sh"
+ ln -s "dash" "$dest/bin/sh"
skip=1
}
diff --git a/recipes/diffutils/recipe.sh b/recipes/diffutils/recipe.sh
index 0b57376fc..474e55df6 100644
--- a/recipes/diffutils/recipe.sh
+++ b/recipes/diffutils/recipe.sh
@@ -31,7 +31,7 @@ function recipe_clean {
function recipe_stage {
dest="$(realpath $1)"
make DESTDIR="$dest" install
- ${HOST}-strip "$1"/bin/*
- rm -rf "$1"/{lib,share}
+ ${HOST}-strip "$dest"/bin/*
+ rm -rf "$dest"/{lib,share}
skip=1
}
diff --git a/recipes/freeciv/recipe.sh b/recipes/freeciv/recipe.sh
index 7916cb422..e705d7755 100644
--- a/recipes/freeciv/recipe.sh
+++ b/recipes/freeciv/recipe.sh
@@ -26,7 +26,8 @@ function recipe_build {
--enable-fcmp=cli \
--with-sdl-prefix="$sysroot" \
ac_cv_lib_SDL_image_IMG_Load=yes \
- ac_cv_lib_SDL_ttf_TTF_OpenFont=yes
+ ac_cv_lib_SDL_ttf_TTF_OpenFont=yes \
+ ac_cv_lib_SDL_gfx_rotozoomSurface=yes
make -j"$(nproc)" V=1
skip=1
}
--
GitLab