openttd: update config.lib.patch

This commit is contained in:
Leonid Pliushch 2020-04-27 17:35:20 +03:00 committed by Yaksh Bariya
parent a034ad11ed
commit 5ddfb25764
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
1 changed files with 12 additions and 8 deletions

View File

@ -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"