From 377940b84b26f61aff25da8b8b51d56ab1c98fe7 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Mon, 10 Dec 2018 13:55:11 -0700
Subject: [PATCH] Fixes for dosbox and ncurses
---
recipes/dosbox/recipe.sh | 10 +++++-----
recipes/ncurses/01-config-sub.patch | 21 ---------------------
recipes/ncurses/recipe.sh | 10 +++++++---
3 files changed, 12 insertions(+), 29 deletions(-)
delete mode 100644 recipes/ncurses/01-config-sub.patch
diff --git a/recipes/dosbox/recipe.sh b/recipes/dosbox/recipe.sh
index 974f51872..d6771f160 100644
--- a/recipes/dosbox/recipe.sh
+++ b/recipes/dosbox/recipe.sh
@@ -2,10 +2,6 @@ VERSION=0.74
TAR=https://sourceforge.net/projects/dosbox/files/dosbox/$VERSION/dosbox-$VERSION.tar.gz/download
BUILD_DEPENDS=(sdl liborbital)
-export CFLAGS="-I$PWD/sysroot/include/SDL/"
-export CPPFLAGS="-I$PWD/sysroot/include/SDL/"
-export LDFLAGS="-L$PWD/sysroot/lib/"
-
function recipe_version {
echo "$VERSION"
skip=1
@@ -17,9 +13,13 @@ function recipe_update {
}
function recipe_build {
+ sysroot="$(realpath ../sysroot)"
+ export CFLAGS="-I$sysroot/include/SDL"
+ export CPPFLAGS="-I$sysroot/include/SDL"
+ export LDFLAGS="-L$sysroot/lib"
./autogen.sh
wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
- ./configure --host=${HOST} --prefix='' --disable-opengl --disable-sdltest --with-sdl-prefix="$PWD/../sysroot"
+ ./configure --host=${HOST} --prefix='' --disable-opengl --disable-sdltest --with-sdl-prefix="$sysroot"
make -j"$(nproc)"
skip=1
}
diff --git a/recipes/ncurses/01-config-sub.patch b/recipes/ncurses/01-config-sub.patch
deleted file mode 100644
index 8ed32be67..000000000
--- a/recipes/ncurses/01-config-sub.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru source/config.sub source-new/config.sub
---- source/config.sub 2015-05-02 13:52:04.000000000 +0200
-+++ source-new/config.sub 2017-08-13 13:12:16.485670615 +0200
-@@ -2,7 +2,7 @@
- # Configuration validation subroutine script.
- # Copyright 1992-2015 Free Software Foundation, Inc.
-
--timestamp='2015-03-08'
-+timestamp='2017-08-13'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -1371,7 +1371,7 @@
- # The portable systems comes first.
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
-- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* | -redox* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- | -sym* | -kopensolaris* | -plan9* \
diff --git a/recipes/ncurses/recipe.sh b/recipes/ncurses/recipe.sh
index 44ab1c745..dda9affda 100644
--- a/recipes/ncurses/recipe.sh
+++ b/recipes/ncurses/recipe.sh
@@ -1,4 +1,4 @@
-VERSION=6.0
+VERSION=6.1
TAR=http://ftp.gnu.org/gnu/ncurses/ncurses-$VERSION.tar.gz
DEPENDS="terminfo"
@@ -13,8 +13,12 @@ function recipe_update {
}
function recipe_build {
- export CPPFLAGS="-P"
- ./configure --host=${HOST} --prefix="" --disable-db-install --without-ada
+ ./configure \
+ --host=${HOST} \
+ --prefix="" \
+ --disable-db-install \
+ --without-ada \
+ cf_cv_func_mkstemp=yes
make -j"$(nproc)"
skip=1
}
--
GitLab