Skip to content
Snippets Groups Projects
Commit 535746a9 authored by Jenkins's avatar Jenkins
Browse files

submodules: update nightly branch

parents 4af2017a 835f5ae6
No related branches found
No related tags found
No related merge requests found
plugins @ adba0af0
Subproject commit 17c0bc64a374d601012943a0a79ace65734dd922 Subproject commit adba0af01d3b90f3f629256acb344379afa97f8a
#!/usr/bin/env bash #!/usr/bin/env bash
# Build and install to a local prefix under this repository. # Build and install to a local prefix under this repository.
export OSTYPE
# Flags: # Flags:
...@@ -81,7 +80,7 @@ else ...@@ -81,7 +80,7 @@ else
BUILDDIR="build-local" BUILDDIR="build-local"
fi fi
# dring # jamid
DAEMON=${TOP}/daemon DAEMON=${TOP}/daemon
cd "$DAEMON" cd "$DAEMON"
...@@ -96,15 +95,10 @@ mkdir -p contrib/native ...@@ -96,15 +95,10 @@ mkdir -p contrib/native
# Build the daemon itself. # Build the daemon itself.
test -f configure || ./autogen.sh test -f configure || ./autogen.sh
if [[ "$OSTYPE" != "darwin"* ]]; then
# Keep the shared libaries on MAC OSX.
sharedLib="--disable-shared"
fi
if [ "${global}" = "true" ]; then if [ "${global}" = "true" ]; then
./configure $sharedLib "$CONFIGURE_FLAGS" ${prefix:+"--prefix=$prefix"} ./configure "$CONFIGURE_FLAGS" ${prefix:+"--prefix=$prefix"}
else else
./configure $sharedLib "$CONFIGURE_FLAGS" --prefix="${INSTALL}/daemon" ./configure "$CONFIGURE_FLAGS" --prefix="${INSTALL}/daemon"
fi fi
make -j"${proc}" V=1 make -j"${proc}" V=1
make_install "${global}" "${priv_install}" make_install "${global}" "${priv_install}"
...@@ -144,6 +138,7 @@ lrc_cmake_flags=(-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}" ...@@ -144,6 +138,7 @@ lrc_cmake_flags=(-DCMAKE_PREFIX_PATH="${CMAKE_PREFIX_PATH}"
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug
-DQT5_VER="${qt5ver}" -DQT5_VER="${qt5ver}"
-DQT5_PATH="${qt5path}" -DQT5_PATH="${qt5path}"
-DENABLE_LIBWRAP=true
$static) $static)
if [ "${global}" = "true" ]; then if [ "${global}" = "true" ]; then
lrc_cmake_flags+=(${prefix:+"-DCMAKE_INSTALL_PREFIX=$prefix"}) lrc_cmake_flags+=(${prefix:+"-DCMAKE_INSTALL_PREFIX=$prefix"})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment