Author: cazfi
Date: Tue Jun 28 07:12:00 2016
New Revision: 33073

URL: http://svn.gna.org/viewcvs/freeciv?rev=33073&view=rev
Log:
Added configure check for fseeko. Build included lua accordingly.

See patch #7322

Modified:
    branches/S2_5/configure.ac
    branches/S2_5/dependencies/lua-5.2/freeciv_lua.patch
    branches/S2_5/dependencies/lua-5.2/src/liolib.c
    branches/S2_5/dependencies/lua-5.2/src/localluaconf.h

Modified: branches/S2_5/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=33073&r1=33072&r2=33073&view=diff
==============================================================================
--- branches/S2_5/configure.ac  (original)
+++ branches/S2_5/configure.ac  Tue Jun 28 07:12:00 2016
@@ -1184,6 +1184,7 @@
 AC_FUNC_FORK
 AC_FUNC_STRCOLL
 AC_FUNC_VPRINTF
+AC_FUNC_FSEEKO
 
 dnl Windows vsnprintf doesn't support argument reordering (see PR#12932)
 if test "x$MINGW32" != "xyes"; then

Modified: branches/S2_5/dependencies/lua-5.2/freeciv_lua.patch
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/dependencies/lua-5.2/freeciv_lua.patch?rev=33073&r1=33072&r2=33073&view=diff
==============================================================================
--- branches/S2_5/dependencies/lua-5.2/freeciv_lua.patch        (original)
+++ branches/S2_5/dependencies/lua-5.2/freeciv_lua.patch        Tue Jun 28 
07:12:00 2016
@@ -1,6 +1,49 @@
-diff -Nurd -X.diff_ignore freeciv/dependencies/lua-5.2/src/luaconf.h 
freeciv/dependencies/lua-5.2/src/luaconf.h
---- freeciv/dependencies/lua-5.2/src/luaconf.h 2013-04-19 01:52:45.162360681 
+0300
-+++ freeciv/dependencies/lua-5.2/src/luaconf.h 2013-04-19 01:57:26.310354514 
+0300
+diff -Nurd lua-5.2/freeciv_lua.patch lua-5.2/freeciv_lua.patch
+--- lua-5.2/freeciv_lua.patch  2016-06-25 01:25:58.950034475 +0300
++++ lua-5.2/freeciv_lua.patch  2016-06-25 01:30:46.753551478 +0300
+@@ -1,27 +0,0 @@
+-diff -Nurd -X.diff_ignore freeciv/dependencies/lua-5.2/src/luaconf.h 
freeciv/dependencies/lua-5.2/src/luaconf.h
+---- freeciv/dependencies/lua-5.2/src/luaconf.h        2013-04-19 
01:52:45.162360681 +0300
+-+++ freeciv/dependencies/lua-5.2/src/luaconf.h        2013-04-19 
01:57:26.310354514 +0300
+-@@ -11,6 +11,7 @@
+- #include <limits.h>
+- #include <stddef.h>
+- 
+-+#include "localluaconf.h"
+- 
+- /*
+- ** ==================================================================
+-@@ -43,7 +44,6 @@
+- #if defined(LUA_USE_LINUX)
+- #define LUA_USE_POSIX
+- #define LUA_USE_DLOPEN               /* needs an extra library: -ldl */
+--#define LUA_USE_READLINE     /* needs some extra libraries */
+- #define LUA_USE_STRTODHEX    /* assume 'strtod' handles hex formats */
+- #define LUA_USE_AFORMAT              /* assume 'printf' handles 'aA' 
specifiers */
+- #define LUA_USE_LONGLONG     /* assume support for long long */
+-@@ -52,7 +52,6 @@
+- #if defined(LUA_USE_MACOSX)
+- #define LUA_USE_POSIX
+- #define LUA_USE_DLOPEN               /* does not need -ldl */
+--#define LUA_USE_READLINE     /* needs an extra library: -lreadline */
+- #define LUA_USE_STRTODHEX    /* assume 'strtod' handles hex formats */
+- #define LUA_USE_AFORMAT              /* assume 'printf' handles 'aA' 
specifiers */
+- #define LUA_USE_LONGLONG     /* assume support for long long */
+diff -Nurd lua-5.2/src/liolib.c lua-5.2/src/liolib.c
+--- lua-5.2/src/liolib.c       2016-06-25 01:25:58.970034443 +0300
++++ lua-5.2/src/liolib.c       2016-06-25 01:29:07.605721751 +0300
+@@ -86,7 +86,7 @@
+ 
+ #if !defined(lua_fseek)       && !defined(LUA_ANSI)   /* { */
+ 
+-#if defined(LUA_USE_POSIX)    /* { */
++#if defined(LUA_USE_SEEKO)    /* { */
+ 
+ #define l_fseek(f,o,w)                fseeko(f,o,w)
+ #define l_ftell(f)            ftello(f)
+diff -Nurd lua-5.2/src/luaconf.h lua-5.2/src/luaconf.h
+--- lua-5.2/src/luaconf.h      2016-06-25 01:26:42.313964121 +0300
++++ lua-5.2/src/luaconf.h      2015-03-21 20:01:35.286587205 +0200
 @@ -11,6 +11,7 @@
  #include <limits.h>
  #include <stddef.h>

Modified: branches/S2_5/dependencies/lua-5.2/src/liolib.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/dependencies/lua-5.2/src/liolib.c?rev=33073&r1=33072&r2=33073&view=diff
==============================================================================
--- branches/S2_5/dependencies/lua-5.2/src/liolib.c     (original)
+++ branches/S2_5/dependencies/lua-5.2/src/liolib.c     Tue Jun 28 07:12:00 2016
@@ -86,7 +86,7 @@
 
 #if !defined(lua_fseek)        && !defined(LUA_ANSI)   /* { */
 
-#if defined(LUA_USE_POSIX)     /* { */
+#if defined(LUA_USE_SEEKO)     /* { */
 
 #define l_fseek(f,o,w)         fseeko(f,o,w)
 #define l_ftell(f)             ftello(f)

Modified: branches/S2_5/dependencies/lua-5.2/src/localluaconf.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/dependencies/lua-5.2/src/localluaconf.h?rev=33073&r1=33072&r2=33073&view=diff
==============================================================================
--- branches/S2_5/dependencies/lua-5.2/src/localluaconf.h       (original)
+++ branches/S2_5/dependencies/lua-5.2/src/localluaconf.h       Tue Jun 28 
07:12:00 2016
@@ -32,6 +32,9 @@
 #if defined(HAVE__LONGJMP) && defined(HAVE__SETJMP)
 #define LUA_USE_ULONGJMP
 #endif
+#if defined(HAVE_FSEEKO)
+#define LUA_USE_FSEEKO
+#endif
 
 #ifdef HAVE_LIBREADLINE
 #define LUA_USE_READLINE


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to