From cd1343a4e225094287dcfbc0c4a8f0fe846ba6c5 Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 17 Nov 2016 16:52:53 +0100
Subject: [PATCH 1/3] more force to strip!

---
 Installation/Jenkins/build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Installation/Jenkins/build.sh b/Installation/Jenkins/build.sh
index 817f97aea3..63b0c247a0 100755
--- a/Installation/Jenkins/build.sh
+++ b/Installation/Jenkins/build.sh
@@ -452,6 +452,7 @@ if [ -z "${MSVC}" ]; then
     # workaround by presetting it:
     if test -z "${STRIP}"; then
         export STRIP=`which strip`
+        CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCMAKE_STRIP=${STRIP}"
     fi
 fi
 

From ed70c04d0ed58ad5038a8a72aeea6316d74486cb Mon Sep 17 00:00:00 2001
From: Wilfried Goesgens <willi@arangodb.com>
Date: Thu, 17 Nov 2016 16:53:15 +0100
Subject: [PATCH 2/3] remove debug stuff

---
 cmake/ArangoDBInstall.cmake | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/cmake/ArangoDBInstall.cmake b/cmake/ArangoDBInstall.cmake
index c5634eecba..f4b9af96af 100644
--- a/cmake/ArangoDBInstall.cmake
+++ b/cmake/ArangoDBInstall.cmake
@@ -171,30 +171,3 @@ configure_file (
   "${CMAKE_CURRENT_BINARY_DIR}/lib/Basics/directories.h"
   NEWLINE_STYLE UNIX
 )
-
-# sub directories --------------------------------------------------------------
-
-#if(BUILD_STATIC_EXECUTABLES)
-#  set(CMAKE_EXE_LINKER_FLAGS -static)
-#  set(CMAKE_FIND_LIBRARY_SUFFIXES .a)
-#  set(CMAKE_EXE_LINK_DYNAMIC_C_FLAGS)       # remove -Wl,-Bdynamic
-#  set(CMAKE_EXE_LINK_DYNAMIC_CXX_FLAGS)
-#  set(CMAKE_SHARED_LIBRARY_C_FLAGS)         # remove -fPIC
-#  set(CMAKE_SHARED_LIBRARY_CXX_FLAGS)
-#  set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS)    # remove -rdynamic
-#  set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS)
-#  # Maybe this works as well, haven't tried yet.
-#  # set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
-#else(BUILD_STATIC_EXECUTABLES)
-#  # Set RPATH to use for installed targets; append linker search path
-#  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LOFAR_LIBDIR}")
-#  set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-#endif(BUILD_STATIC_EXECUTABLES) 
-
-
-#--------------------------------------------------------------------------------
-#get_cmake_property(_variableNames VARIABLES)
-#foreach (_variableName ${_variableNames})
-#    message(STATUS "${_variableName}=${${_variableName}}")
-#endforeach()
-#--------------------------------------------------------------------------------

From aea25a04be89a0de37a7ffd397b8b04bb154fa88 Mon Sep 17 00:00:00 2001
From: jsteemann <jan@arangodb.com>
Date: Thu, 17 Nov 2016 17:16:31 +0100
Subject: [PATCH 3/3] remove alignas(64) because it breaks the binary on some
 platforms

---
 arangod/Wal/LogfileManager.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arangod/Wal/LogfileManager.h b/arangod/Wal/LogfileManager.h
index 36a8a1b4b5..442900cb5f 100644
--- a/arangod/Wal/LogfileManager.h
+++ b/arangod/Wal/LogfileManager.h
@@ -521,11 +521,7 @@ class LogfileManager final : public application_features::ApplicationFeature {
   // a lock protecting ALL buckets in _transactions
   basics::ReadWriteLock _allTransactionsLock;
 
-#ifdef _WIN32
   struct {
-#else
-  struct alignas(64) {
-#endif
     // a lock protecting _activeTransactions and _failedTransactions
     basics::ReadWriteLock _lock;