Merge branch 'stable' of github.com:tarantool/tarantool into stable

cmake/luajit.cmake

@@ -161,12 +161,17 @@ macro(luajit_build)
     separate_arguments(luajit_ldflags)
     separate_arguments(luajit_host_cc)
     separate_arguments(luajit_target_cc)
-    set (luajit_buildoptions ${luajit_buildoptions} HOST_CC="${luajit_host_cc}" TARGET_CC="${luajit_target_cc}" CCOPT="${luajit_copt}")
+    set (luajit_buildoptions ${luajit_buildoptions}
+        CFLAGS=""
+        CXXFLAGS=""
+        HOST_CC="${luajit_host_cc}"
+        TARGET_CC="${luajit_target_cc}"
+        CCOPT="${luajit_copt}")
     set (luajit_buildoptions ${luajit_buildoptions} Q='' LDFLAGS="${luajit_ldflags}")
     if (${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
         add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/third_party/luajit/src/libluajit.a
             WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/luajit
-            COMMAND $(MAKE) clean
+            COMMAND $(MAKE) ${luajit_buildoptions} clean
             COMMAND $(MAKE) -C src ${luajit_buildoptions} libluajit.a
             DEPENDS ${CMAKE_SOURCE_DIR}/CMakeCache.txt
         )

doc/www-data.in/download.cmake

@@ -62,9 +62,9 @@ It can be added to your apt sources list with:
     sudo apt-get update
     sudo apt-get install tarantool tarantool-client
 
-### CentOS 5-6 GNU/Linux
+### CentOS 5-6 and RHEL 5-6
 
-CentOS GNU/Linux repository is available at
+CentOS repository is available at
 <a href="http://tarantool.org/dist/centos">http://tarantool.org/dist/centos</a>.
 
 Add the following section to your yum repository list (/etc/yum.repos.d/tarantool.repo)
@@ -76,47 +76,20 @@ to enable it:
     enabled=1
     gpgcheck=0
 
-### Standalone packages for RedHat, FreeBSD, Mac OS X
+### Gentoo Linux
 
-<table border=1 title="Download the latest build, @PACKAGE_VERSION@" width=100%>
-
-<!-- RPM -->
-
-  <th colspan=3>RedHat</th>
-
-  <tr>
-    <td>
-        RedHat <b>.rpm</b>
-    </td>
-
-    <td align=center>
-        <a href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-i686.rpm">32-bit</a>
-    </td>
+Tarantool is available from `tarantool` portage overlay. Use
+[layman](http://wiki.gentoo.org/wiki/Layman) to add the overlay to your system:
 
-    <td align=center>
-        <a
-        href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-x86_64.rpm">64-bit</a>
-    </td>
-  </tr>
+    # layman -S
+    # layman -a tarantool
+    # emerge dev-db/tarantool -av
 
-  <tr>
-    <td>
-        RedHat <b>.rpm</b>, with debug info
-    </td>
-    <td align=center>
-        <a
-        href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-i686-debug.rpm">32-bit</a>
-    </td>
-
-    <td align=center>
-        <a
-        href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-x86_64-debug.rpm">64-bit</a>
-    </td>
-  </tr>
+### Other Linux distributions
 
+<table border=1 title="Download the latest build, @PACKAGE_VERSION@" width=100%>
 <!-- .tar.gz -->
-  <th colspan=3>Other Linux distributions</th>
-
+  <th colspan=3>Static builds for Linux</th>
   <tr>
     <td>
         Binary tarball (<b>.tar.gz</b>)
@@ -129,30 +102,22 @@ to enable it:
         <a href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-linux-x86_64.tar.gz">64-bit</a>
     </td>
   </tr>
+</table>
 
-  <th colspan=3>FreeBSD</th>
+### FreeBSD
 
-<!-- .tar.gz -->
+Tarantool is available from the FreeBSD Ports collection
+(`databases/tarantool`). 
 
-  <tr>
-    <td>
-        Binary tarball (<b>.tar.gz</b>)
-    </td>
-    <td align=center>
-        <a
-        href="http://tarantool.org/dist/tarantool-@PACKAGE_VERSION@-freebsd-i386.tar.gz">32-bit</a>
-    </td>
+### OS X
 
-    <td align=center>
-    </td>
-  </tr>
-  <th colspan=4>Mac OS X</th>
-  <tr>
-    <td align=center colspan=4>brew install http://tarantool.org/dist/tarantool.rb</td>
-  <tr>
+You can install Tarantool using homebrew:
 
-</table>
+    $ brew install --use-clang http://tarantool.org/dist/tarantool.rb
 
+Please upgrade `clang` to version 3.2 or later using
+```Command Line Tools for Xcode``` disk image version 4.6+ from
+[Apple Developer](https://developer.apple.com/downloads/) web-site.
 
 # Development branch
 
@@ -171,6 +136,8 @@ The server roadmap is maintained on [Launchpad](http://launchpad.net/tarantool).
 - PHP driver, [https://github.com/tarantool/tarantool-php](https://github.com/tarantool/tarantool-php)
 - node.js driver,
   [https://github.com/devgru/node-tarantool](https://github.com/devgru/node-tarantool)
+- Erlang driver,
+  [https://github.com/rtsisyk/etarantool](https://github.com/rtsisyk/etarantool)
 - C connector [is maintained in the server source tree](https://github.com/tarantool/tarantool/blob/master/connector/c)
 
 {% page download ru %}