From 5ddfb25764e028586e6b6dc9944cab478c10b439 Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Mon, 27 Apr 2020 17:35:20 +0300 Subject: [PATCH] openttd: update config.lib.patch --- x11-packages/openttd/config.lib.patch | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/x11-packages/openttd/config.lib.patch b/x11-packages/openttd/config.lib.patch index 47273a5f7..f075d3334 100644 --- a/x11-packages/openttd/config.lib.patch +++ b/x11-packages/openttd/config.lib.patch @@ -1,18 +1,18 @@ -diff -uNr OpenTTD-1.9.1/config.lib OpenTTD-1.9.1.mod/config.lib ---- OpenTTD-1.9.1/config.lib 2019-04-08 22:37:59.000000000 +0300 -+++ OpenTTD-1.9.1.mod/config.lib 2019-06-30 00:21:04.831588247 +0300 -@@ -1616,10 +1616,6 @@ +diff -uNr OpenTTD-1.10.1/config.lib OpenTTD-1.10.1.mod/config.lib +--- OpenTTD-1.10.1/config.lib 2020-04-13 20:39:51.000000000 +0300 ++++ OpenTTD-1.10.1.mod/config.lib 2020-04-27 17:34:56.453223975 +0300 +@@ -1579,10 +1579,6 @@ fi fi -- if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "DOS" ] && [ "$os" != "OS2" ]; then +- if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "OSX" ] && [ "$os" != "OS2" ]; then - LIBS="$LIBS -lpthread" - fi - - if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ] && [ "$os" != "DOS" ]; then + if [ "$os" != "CYGWIN" ] && [ "$os" != "HAIKU" ] && [ "$os" != "MINGW" ]; then LIBS="$LIBS -lc" fi -@@ -2651,7 +2647,7 @@ +@@ -2608,10 +2604,10 @@ log 2 "detecting $2" if [ "$1" = "1" ] || [ "$1" = "" ] || [ "$1" = "2" ]; then @@ -20,4 +20,8 @@ diff -uNr OpenTTD-1.9.1/config.lib OpenTTD-1.9.1.mod/config.lib + eval "$2=`ls -1 @TERMUX_PREFIX@/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`" eval "res=\$$2" if [ -z "$res" ]; then - log 2 " trying /usr/include/$4$5... no" +- log 2 " trying /usr/include/$4$5... no" ++ log 2 " trying @TERMUX_PREFIX@/include/$4$5... no" + eval "$2=`ls -1 /usr/local/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`" + fi + eval "res=\$$2"