summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMarco Marinello <marco.marinello@school.rainerum.it>2022-04-08 21:03:06 +0200
committerpedropintosilva <65948705+pedropintosilva@users.noreply.github.com>2022-04-12 09:57:10 +0200
commitc544acfd2294387b01589c6db636ca592b70ca2e (patch)
tree83d7a7049c5362dfa61661003d6b4c12b1ab88d6 /docker
parentTranslated using Weblate (Chinese (Simplified)) (diff)
downloadonline-c544acfd2294387b01589c6db636ca592b70ca2e.tar.gz
online-c544acfd2294387b01589c6db636ca592b70ca2e.zip
[docker] Be consistent in number of processors used to build
Signed-off-by: Marco Marinello <contact+nohuman@marinello.bz.it> Change-Id: I063b82ad9ee7b8795637ea058e1e15b8331c8818
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/from-source/build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/from-source/build.sh b/docker/from-source/build.sh
index 65dbacff2d..21f8fab70e 100755
--- a/docker/from-source/build.sh
+++ b/docker/from-source/build.sh
@@ -111,7 +111,7 @@ if [ "$CORE_BRANCH" == "distro/collabora/co-22.05" ]; then
else
( cd core && ./autogen.sh --with-distro=LibreOfficeOnline ) || exit 1
fi
-( cd core && make $CORE_BUILD_TARGET ) || exit 1
+( cd core && make -j $(nproc) $CORE_BUILD_TARGET ) || exit 1
# copy stuff
mkdir -p "$INSTDIR"/opt/
@@ -122,7 +122,7 @@ cp -a core/instdir "$INSTDIR"/opt/lokit
# build
( cd online && ./autogen.sh ) || exit 1
( cd online && ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --enable-silent-rules --with-lokit-path="$BUILDDIR"/core/include --with-lo-path=/opt/lokit --with-poco-includes=$BUILDDIR/poco/include --with-poco-libs=$BUILDDIR/poco/lib $ONLINE_EXTRA_BUILD_OPTIONS) || exit 1
-( cd online && make -j 8) || exit 1
+( cd online && make -j $(nproc)) || exit 1
# copy stuff
( cd online && DESTDIR="$INSTDIR" make install ) || exit 1