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

finalize xc compile

This commit is contained in:
Wilfried Goesgens 2016-12-07 16:33:20 +01:00
parent 3f6eff9baf
commit e1b1eb2048
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Installation/Jenkins/build.sh
View File

@ -386,7 +386,8 @@ elif [ "$CLANG36" == 1 ]; then
CXXFLAGS="${CXXFLAGS} -std=c++11"
elif [ "${XCGCC}" = 1 ]; then
USE_JEMALLOC=0
BUILD_DIR="${BUILD_DIR}-${TOOL_PREFIX}"
BUILD_DIR="${BUILD_DIR}-`basename ${TOOL_PREFIX}`"
# tell cmake we're cross compiling:
CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCROSS_COMPILING=true -DCMAKE_SYSTEM_NAME=Linux"

10
cmake/packages/client/deb.txt
View File

@ -10,6 +10,8 @@ cmake_minimum_required(VERSION 2.8)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "@PROJECT_BINARY_DIR@/bin/")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_X ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
set(CMAKE_INSTALL_DO_STRIP 1)
set(CMAKE_STRIP @CMAKE_STRIP@)
set(CROSS_COMPILING @CROSS_COMPILING@)
set(CMAKE_INSTALL_BINDIR @CMAKE_INSTALL_BINDIR@)
set(CMAKE_INSTALL_FULL_BINDIR @CMAKE_INSTALL_FULL_BINDIR@)
@ -63,7 +65,13 @@ set(CPACK_DEBIAN_PACKAGE_SECTION "shell")
set(CPACK_PACKAGE_VENDOR ${ARANGODB_PACKAGE_VENDOR})
set(CPACK_PACKAGE_CONTACT ${ARANGODB_PACKAGE_CONTACT})
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT})
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
# build of dependecies don't work on cross compiling (yet)
if (CROSS_COMPILING)
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.14), libgcc1 (>= 1:3.4), libssl1.0.0 (>= 1.0.1), libstdc++6 (>= 5.2)")
else()
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
endif()
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, ${CPACKG_PACKAGE_CONFLICTS}, ${CPACKG_PACKAGE_CONFLICTS}-client, ${CPACK_PACKAGE_NAME}")
set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
set(CPACK_COMPONENTS_ALL debian-extras)

2
cmake/packages/deb.cmake
View File

@ -10,7 +10,7 @@ set(PACKAGING_HANDLE_CONFIG_FILES true)
FILE(READ "${PROJECT_SOURCE_DIR}/Installation/debian/packagedesc.txt" CPACK_DEBIAN_PACKAGE_DESCRIPTION)
set(CPACK_DEBIAN_PACKAGE_SECTION "database")
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, ${CPACKG_PACKAGE_CONFLICTS}, ${CPACKG_PACKAGE_CONFLICTS}-client, ${CPACK_PACKAGE_NAME}-client")
# build of dependecies (yet) don't works on cross compiling
# build of dependecies don't work on cross compiling (yet)
if (CROSS_COMPILING)
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.14), libgcc1 (>= 1:3.4), libssl1.0.0 (>= 1.0.1), libstdc++6 (>= 5.2)")

3
scripts/build-xc-deb.sh
View File

@ -16,11 +16,10 @@ done
./Installation/Jenkins/build.sh \
standard \
--rpath \
--parallel 25 \
--package DEB \
$SNAP \
--xcArm arm-linux-gnueabihf \
--xcArm /usr/bin/arm-linux-gnueabihf \
--buildDir build-${EP}deb \
--targetDir /var/tmp/ \
--noopt \