8000 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel · rowhit/arangodb@dca5eb8 · GitHub
[go: up one dir, main page]
Skip to content

Commit dca5eb8

Browse files
kvahedkvahed
committed
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2 parents 2fadea8 + c81df0e commit dca5eb8

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

‎Installation/Jenkins/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,8 @@ elif [ "$CLANG36" == 1 ]; then
386386
CXXFLAGS="${CXXFLAGS} -std=c++11"
387387
elif [ "${XCGCC}" = 1 ]; then
388388
USE_JEMALLOC=0
389-
BUILD_DIR="${BUILD_DIR}-${TOOL_PREFIX}"
389+
390+
BUILD_DIR="${BUILD_DIR}-`basename ${TOOL_PREFIX}`"
390391

391392
# tell cmake we're cross compiling:
392393
CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCROSS_COMPILING=true -DCMAKE_SYSTEM_NAME=Linux"

‎cmake/packages/client/deb.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ cmake_minimum_required(VERSION 2.8)
1010
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "@PROJECT_BINARY_DIR@/bin/")
1111
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_X ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
1212
set(CMAKE_INSTALL_DO_STRIP 1)
13+
set(CMAKE_STRIP @CMAKE_STRIP@)
14+
set(CROSS_COMPILING @CROSS_COMPILING@)
1315

1416
set(CMAKE_INSTALL_BINDIR @CMAKE_INSTALL_BINDIR@)
1517
set(CMAKE_INSTALL_FULL_BINDIR @CMAKE_INSTALL_FULL_BINDIR@)
@@ -63,7 +65,13 @@ set(CPACK_DEBIAN_PACKAGE_SECTION "shell")
6365
set(CPACK_PACKAGE_VENDOR ${ARANGODB_PACKAGE_VENDOR})
6466
set(CPACK_PACKAGE_CONTACT ${ARANGODB_PACKAGE_CONTACT})
6567
set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT})
66-
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
68+
# build of dependecies don't work on cross compiling (yet)
69+
if (CROSS_COMPILING)
70+
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
71+
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.14), libgcc1 (>= 1:3.4), libssl1.0.0 (>= 1.0.1), lib 8000 stdc++6 (>= 5.2)")
72+
else()
73+
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
74+
endif()
6775
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, ${CPACKG_PACKAGE_CONFLICTS}, ${CPACKG_PACKAGE_CONFLICTS}-client, ${CPACK_PACKAGE_NAME}")
6876
set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
6977
set(CPACK_COMPONENTS_ALL debian-extras)

‎cmake/packages/deb.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set(PACKAGING_HANDLE_CONFIG_FILES true)
1010
FILE(READ "${PROJECT_SOURCE_DIR}/Installation/debian/packagedesc.txt" CPACK_DEBIAN_PACKAGE_DESCRIPTION)
1111
set(CPACK_DEBIAN_PACKAGE_SECTION "database")
1212
set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, ${CPACKG_PACKAGE_CONFLICTS}, ${CPACKG_PACKAGE_CONFLICTS}-client, ${CPACK_PACKAGE_NAME}-client")
13-
# build of dependecies (yet) don't works on cross compiling
13+
# build of dependecies don't work on cross compiling (yet)
1414
if (CROSS_COMPILING)
1515
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
1616
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.14), libgcc1 (>= 1:3.4), libssl1.0.0 (>= 1.0.1), libstdc++6 (>= 5.2)")

‎scripts/build-xc-deb.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@ done
1616

1717
./Installation/Jenkins/build.sh \
1818
standard \
19-
--rpath \
2019
--parallel 25 \
2120
--package DEB \
2221
$SNAP \
23-
--xcArm arm-linux-gnueabihf \
22+
--xcArm /usr/bin/arm-linux-gnueabihf \
2423
--buildDir build-${EP}deb \
2524
--targetDir /var/tmp/ \
2625
--noopt \

0 commit comments

Comments
 (0)
0