Build fixing patches #24

blochl · Jul 21, 2015

Hi,

These patches solve some compilation issues which the Diod 9p server currently has:

Eliminating an error when trying to cross-compile a static diod binary. Cross-compiling a statically linked binary may be very useful for embedded or minimalist systems.
If the Perl binary was not in /usr/bin/perl, the build would fail.
The build would also fail if Lua 5.2 (and not 5.1) was installed. Deprecated Lua functions replaced.
Building instructions in README.md were updated.

garlick · Jul 21, 2015

Looks good, thanks!

blochl · Jul 21, 2015

Thanks!

garlick merged commit 2d5ac46 into chaos:master Jul 21, 2015

blochl	`Diod: Fix for cross-compiling` … Fix failures during cross-compiling on some systems. Signed-off-by: Leonid Bloch <leonid@daynix.com>	`800ec4d`
blochl	`Diod: Fix for non-standard location of Perl` … If the perl binary was not in /usr/bin/perl, the build would fail. Signed-off-by: Leonid Bloch <leonid@daynix.com>	`0beed57`
blochl	`Diod: Lua detection fix and replacing deprecated function` … lua_open was replaced with luaL_newstate, which succeeded it in Lua 5.2. lua_open was already deprecated in Lua 5.1. Also, in order to check for Lua during config, a test for luaL_newstate is used, which works for both Lua 5.1 and 5.2, instead of testing for lua_call, which does not work for Lua 5.2. Signed-off-by: Leonid Bloch <leonid@daynix.com>	`97fb8fd`
blochl	`Diod: Updated building instructions` … Updated build instructions in README.md. Signed-off-by: Leonid Bloch <leonid@daynix.com>	`900fa1f`

@@ @@ -3,21 +3,24 @@ @@
      `diod` is a multi-threaded, user space file server that speaks
      [9P2000.L protocol](protocol.md).
-    -### Building on Debian
+    +### Building
+    +#### On Debian
      ```
-    -sudo apt-get install liblua5.1-dev libmunge-dev libwrap0-dev libcap-dev
-    -./configure CPPFLAGS="-I/usr/include/lua5.1" --with-lua-suffix=5.1
+    +sudo apt-get install build-essential libpopt-dev ncurses-dev automake autoconf
+    +sudo apt-get install liblua5.1-dev libmunge-dev libwrap0-dev libcap-dev libattr1-dev
+    +./autogen.sh
+    +./configure
      make
      make check
      ```
-    -### Building on Red Hat
+    +#### On Red Hat
      ```
-    -sudo yum install epel-release
+    +sudo yum install epel-release gperftools-devel automake autoconf libattr-devel
      sudo yum install lua-devel munge-devel tcp_wrappers-devel libcap-devel
-    -sudo yum install gperftools-devel
+    +./autogen.sh
      ./configure
      make
      make check

@@ @@ -164,7 +164,7 @@ AC_DEFUN([AX_LUA_LIBS], @@
        AC_CHECK_LIB([m], [exp], [lua_extra_libs="$lua_extra_libs -lm"], [])
        AC_CHECK_LIB([dl], [dlopen], [lua_extra_libs="$lua_extra_libs -ldl"], [])
        AC_CHECK_LIB([lua$with_lua_suffix],
-    -    [lua_call],
+    +    [luaL_newstate],
          [LIBLUA="$LUA_LIB -llua$with_lua_suffix $lua_extra_libs"],
          [],
          [$LIBLUA $lua_extra_libs])

                  path = config.configpath;  /* missing default file is not fatal */
          }
          if (path) {
-    -    	lua_State *L = lua_open ();
+    +        lua_State *L = luaL_newstate ();
              luaopen_base (L);
              luaopen_table (L);

@@ -1,3 +1,5 @@
+    +#include <stdarg.h>
+    +
      void diod_log_init (char *p);
      void diod_log_fini (void);
      void diod_log_set_dest (char *dest);

chaos/diod