From d09a135d984a4a88740b01dcd3e10d5570bc4aed Mon Sep 17 00:00:00 2001 From: Jordan Galby <jordan.galby@cea.fr> Date: Wed, 31 Jan 2024 11:22:28 +0100 Subject: [PATCH] Add missing nproc in make -j commands The command `make -j` (without a number) runs as infinite parallel jobs, this can overwhelm your machine. --- scripts/appimage/Dockerfile | 6 +++--- scripts/appimage/build_appimage.sh | 2 +- scripts/compile-test/BuildDependenciesQt6 | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/appimage/Dockerfile b/scripts/appimage/Dockerfile index 4d550519a..aaf52844f 100644 --- a/scripts/appimage/Dockerfile +++ b/scripts/appimage/Dockerfile @@ -62,7 +62,7 @@ RUN wget https://download.qt.io/official_releases/qt/5.15/${QT_VERSION}/single/q -skip qtpurchasing -skip qtserialbus -skip qtserialport -skip qtwebchannel -skip qtwebglplugin \ -skip qtwebview -skip qtlocation -skip qtspeech -skip qtwinextras \ -release -ssl -no-compile-examples -cups -I /usr/include/openssl11 -prefix /usr && \ - make -j && make install && cd .. && rm -Rf build qt-everywhere-* + make -j$(nproc) && make install && cd .. && rm -Rf build qt-everywhere-* # appimage build tools RUN wget https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20230713-1/linuxdeploy-x86_64.AppImage && chmod +x linuxdeploy-x86_64.AppImage && \ @@ -74,7 +74,7 @@ RUN cd /opt && mkdir qcustomplot && cd qcustomplot && \ cd qcustomplot && cp qcustomplot.h /usr/include && \ wget https://www.qcustomplot.com/release/${QCustomPlot_VERSION}/QCustomPlot-sharedlib.tar.gz && \ tar -xf QCustomPlot-sharedlib.tar.gz && ls && cd qcustomplot-sharedlib/sharedlib-compilation \ - && qmake . && make -j && mv libqcustomplot.so* /usr/lib && cd /opt && rm -Rf qcustomplot && ldconfig + && qmake . && make -j$(nproc) && mv libqcustomplot.so* /usr/lib && cd /opt && rm -Rf qcustomplot && ldconfig # rust demangle RUN cd /opt/ && mkdir rust && cd rust && wget https://sh.rustup.rs -O rustup.sh && \ @@ -125,7 +125,7 @@ RUN ldconfig && \ # kddockwidgets RUN cd /opt && git clone --recursive https://github.com/KDAB/KDDockWidgets.git -b ${KDDockWidgets_VERSION} && \ cd KDDockWidgets && mkdir build && cd build && cmake -DCMAKE_INSTALL_PREFIX=/usr -DKDDockWidgets_EXAMPLES=0 -DKDDockWidgets_FRONTENDS="qtwidgets" .. && \ - make -j && make install && cd /opt && rm -Rf KDDockWidgets + make -j$(nproc) && make install && cd /opt && rm -Rf KDDockWidgets FROM intermediate diff --git a/scripts/appimage/build_appimage.sh b/scripts/appimage/build_appimage.sh index 922d7818b..52fd1b05e 100755 --- a/scripts/appimage/build_appimage.sh +++ b/scripts/appimage/build_appimage.sh @@ -27,7 +27,7 @@ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_DISABLE_FIND_PACKAGE_KGraphViewerPart=ON \ -DAPPIMAGE_BUILD=ON "-DCMAKE_INSTALL_PREFIX=/usr" "$srcdir" -make -j +make -j$(nproc) DESTDIR=appdir make install tar -cjvf "/output/hotspot-debuginfo-$gitversion-x86_64.tar.bz2" \ diff --git a/scripts/compile-test/BuildDependenciesQt6 b/scripts/compile-test/BuildDependenciesQt6 index 54dd03877..d80ea47e2 100644 --- a/scripts/compile-test/BuildDependenciesQt6 +++ b/scripts/compile-test/BuildDependenciesQt6 @@ -15,7 +15,7 @@ RUN wget https://www.qcustomplot.com/release/2.1.1/QCustomPlot-source.tar.gz && cp -va qcustomplot.h /usr/include/ && \ wget https://www.qcustomplot.com/release/2.1.1/QCustomPlot-sharedlib.tar.gz && \ tar -xf QCustomPlot-sharedlib.tar.gz && cd qcustomplot-sharedlib/sharedlib-compilation && \ - qmake6 CONFIG+=release CONFIG+=force_debug_info && make -j && \ + qmake6 CONFIG+=release CONFIG+=force_debug_info && make -j$(nproc) && \ cp -va libqcustomplot* /usr/lib/x86_64-linux-gnu/ && cd /opt && rm -Rf qcustomplot-source RUN git clone -b $KDDOCKWIDGETS_VERSION https://github.com/KDAB/KDDockWidgets && \