Skip to content
Snippets Groups Projects
Commit 52a452fd authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents e80361db c3c2cc4b
No related branches found
No related tags found
No related merge requests found
client-android @ 6307f2c3
Subproject commit 9b66cdbb308e2f0baf92b332b8c0933bd4eabcd9
Subproject commit 6307f2c34c97e3ba7a83976ae3524d83b1cb040f
client-gnome @ 184d75c7
Subproject commit b4da4a9165cc51c77a003614ab502f6eabef6774
Subproject commit 184d75c7b4a0625aaeb0fa341af39a49b401dbd2
client-ios @ 89c096b8
Subproject commit 496f6690c7d5ac25404089724c182d829a6771c7
Subproject commit 89c096b8b5b11175cd80d48a311862893c3cce28
client-macosx @ 5f7318fc
Subproject commit cacbdf03d64336dbd970743d906342b141b44125
Subproject commit 5f7318fc5149041c8f72612dd829955f2bd07b71
client-qt @ b34b8cf5
Subproject commit 3dd206e6f0c01c2df655b90d32205109939bda98
Subproject commit b34b8cf5230f77570f4cf39018b7888dd04d003c
daemon @ ac499340
Subproject commit c28f0af5bce653864c494a4e8c1ad9f74d934945
Subproject commit ac4993401ae33cea4391cd90773492f7aab2d6aa
lrc @ 011943c4
Subproject commit 5512b1a483c1e07703c619f85b9fbe4e664a7f65
Subproject commit 011943c4b8db106a94406d0d441a32fda68d0256
......@@ -47,6 +47,8 @@ export PATH := $(QT_JAMI_PREFIX)/bin:${PATH}
export LD_LIBRARY_PATH := $(QT_JAMI_PREFIX)/lib:${LD_LIBRARY_PATH}
export PKG_CONFIG_PATH := $(QT_JAMI_PREFIX)/lib/pkgconfig:${PKG_CONFIG_PATH}
export CMAKE_PREFIX_PATH := $(QT_JAMI_PREFIX)/lib/cmake:${CMAKE_PREFIX_PATH}
export CFLAGS := $(CFLAGS) -fno-lto
export CXXFLAGS := $(CXXFLAGS) -fno-lto
# Installation directories.
OCI_INSTALL_DIR = $(CURDIR)/debian/$(JAMI_ALL_IN_ONE_PKG_NAME)
......
......@@ -245,7 +245,7 @@ parts:
cd $SNAPCRAFT_PART_BUILD/daemon
./autogen.sh
./configure --prefix=/usr
./configure --prefix=/usr --without-dbus
make -j$SNAPCRAFT_PARALLEL_BUILD_COUNT
DESTDIR=$SNAPCRAFT_PART_INSTALL make install
......
......@@ -257,7 +257,7 @@ parts:
cd $SNAPCRAFT_PART_BUILD/daemon
./autogen.sh
./configure --prefix=/usr
./configure --prefix=/usr --without-dbus
make -j$SNAPCRAFT_PARALLEL_BUILD_COUNT
DESTDIR=$SNAPCRAFT_PART_INSTALL make install
......
plugins @ 27e01fd8
Subproject commit adba0af01d3b90f3f629256acb344379afa97f8a
Subproject commit 27e01fd8f8a62d8671af93578a2415df4714a017
......@@ -98,20 +98,27 @@ mkdir -p contrib/native
../bootstrap ${prefix:+"--prefix=$prefix"}
make -j"${proc}"
)
if [[ "${enable_libwrap}" != "true" ]]; then
# Disable shared if requested
if [[ "$OSTYPE" != "darwin"* ]]; then
# Keep the shared libaries on MAC OSX.
if [ "${enable_libwrap}" == "false" ]; then
CONFIGURE_FLAGS+=( --disable-shared)
CONFIGURE_FLAGS+=" --disable-shared"
fi
fi
BUILD_TYPE="Release"
if [ "${debug}" = "true" ]; then
BUILD_TYPE="Debug"
CONFIGURE_FLAGS+=" --enable-debug"
fi
# Build the daemon itself.
test -f configure || ./autogen.sh
if [ "${global}" = "true" ]; then
./configure "$CONFIGURE_FLAGS" ${prefix:+"--prefix=$prefix"}
./configure ${CONFIGURE_FLAGS} ${prefix:+"--prefix=$prefix"}
else
./configure "$CONFIGURE_FLAGS" --prefix="${INSTALL}/daemon"
./configure ${CONFIGURE_FLAGS} --prefix="${INSTALL}/daemon"
fi
make -j"${proc}" V=1
make_install "${global}" "${priv_install}"
......@@ -148,7 +155,7 @@ mkdir -p "${BUILDDIR}"
cd "${BUILDDIR}"
# Compute LRC CMake flags
lrc_cmake_flags=(-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
-DQT5_VER="${qt5ver}"
-DQT5_PATH="${qt5path}"
-DENABLE_LIBWRAP="${enable_libwrap}"
......@@ -169,7 +176,7 @@ cd "${TOP}/${client}"
mkdir -p "${BUILDDIR}"
cd "${BUILDDIR}"
client_cmake_flags=(-DCMAKE_BUILD_TYPE=Debug
client_cmake_flags=(-DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}")
if [ "${client}" = "client-qt" ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment