Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2016-11-17 17:18:41 +01:00
parent f74fe77a40 aea25a04be
commit a49649abe5
3 changed files with 1 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Installation/Jenkins/build.sh
View File

@ -452,6 +452,7 @@ if [ -z "${MSVC}" ]; then
# workaround by presetting it: # workaround by presetting it:
if test -z "${STRIP}"; then if test -z "${STRIP}"; then
export STRIP=`which strip` export STRIP=`which strip`
CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCMAKE_STRIP=${STRIP}"
fi fi
fi fi

4
arangod/Wal/LogfileManager.h
View File

@ -521,11 +521,7 @@ class LogfileManager final : public application_features::ApplicationFeature {
// a lock protecting ALL buckets in _transactions // a lock protecting ALL buckets in _transactions
basics::ReadWriteLock _allTransactionsLock; basics::ReadWriteLock _allTransactionsLock;
#ifdef _WIN32
struct { struct {
#else
struct alignas(64) {
#endif
// a lock protecting _activeTransactions and _failedTransactions // a lock protecting _activeTransactions and _failedTransactions
basics::ReadWriteLock _lock; basics::ReadWriteLock _lock;

27
cmake/ArangoDBInstall.cmake
View File

@ -171,30 +171,3 @@ configure_file (
"${CMAKE_CURRENT_BINARY_DIR}/lib/Basics/directories.h" "${CMAKE_CURRENT_BINARY_DIR}/lib/Basics/directories.h"
NEWLINE_STYLE UNIX 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()
#--------------------------------------------------------------------------------