From 05e0b93c6e8fa40ef3e55ba0334cb8dd4aaf4d42 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 1 Dec 2022 18:00:15 -0700
Subject: [PATCH] Improvements to freeciv recipe, still not working
---
recipes/freeciv/recipe.sh | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/recipes/freeciv/recipe.sh b/recipes/freeciv/recipe.sh
index c97e02c29..bbbf7fced 100644
--- a/recipes/freeciv/recipe.sh
+++ b/recipes/freeciv/recipe.sh
@@ -1,4 +1,4 @@
-VERSION=2.6.0
+VERSION=2.6.6
TAR=http://files.freeciv.org/stable/freeciv-$VERSION.tar.bz2
BUILD_DEPENDS=(curl freetype libiconv liborbital libpng openssl nghttp2 sdl sdl_gfx sdl_image sdl_mixer sdl_ttf zlib)
@@ -11,7 +11,8 @@ function recipe_build {
wget -O bootstrap/config.sub "https://gitlab.redox-os.org/redox-os/gnu-config/-/raw/master/config.sub?inline=false"
sysroot="$(realpath ../sysroot)"
export CFLAGS="-I$sysroot/include"
- export LDFLAGS="-L$sysroot/lib"
+ export LDFLAGS="-L$sysroot/lib --static"
+ export SDL_CONFIG="$sysroot/bin/sdl-config"
./configure \
--build=${BUILD} \
--host="$HOST" \
@@ -24,7 +25,9 @@ function recipe_build {
--with-sdl-prefix="$sysroot" \
ac_cv_lib_SDL_image_IMG_Load=yes \
ac_cv_lib_SDL_ttf_TTF_OpenFont=yes \
- ac_cv_lib_SDL_gfx_rotozoomSurface=yes
+ ac_cv_lib_SDL_gfx_rotozoomSurface=yes \
+ gui_sdl_cflags="${CFLAGS}" \
+ gui_sdl_ldflags="${LDFLAGS}"
"$REDOX_MAKE" -j"$($NPROC)" V=1
skip=1
}
--
GitLab