From bf8b87964254c632eb34cc86b4beb14699ac472d Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 2 Apr 2024 22:52:13 +0200 Subject: [PATCH] Remove nproc workaround from Qt 5 packages after workaround via buildenv --- devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep | 4 ++-- devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep | 4 ++-- qt5-3d/mingw-w64-static/PKGBUILD | 4 ++-- qt5-3d/mingw-w64/PKGBUILD | 4 ++-- qt5-activeqt/mingw-w64/PKGBUILD | 4 ++-- qt5-base/mingw-w64-static/PKGBUILD | 4 ++-- qt5-base/mingw-w64/PKGBUILD | 4 ++-- qt5-canvas3d/mingw-w64-static/PKGBUILD | 4 ++-- qt5-canvas3d/mingw-w64/PKGBUILD | 4 ++-- qt5-charts/mingw-w64-static/PKGBUILD | 4 ++-- qt5-charts/mingw-w64/PKGBUILD | 4 ++-- qt5-connectivity/mingw-w64-static/PKGBUILD | 4 ++-- qt5-connectivity/mingw-w64/PKGBUILD | 4 ++-- qt5-datavis3d/mingw-w64-static/PKGBUILD | 4 ++-- qt5-datavis3d/mingw-w64/PKGBUILD | 4 ++-- qt5-declarative/mingw-w64-static/PKGBUILD | 4 ++-- qt5-declarative/mingw-w64/PKGBUILD | 4 ++-- qt5-gamepad/mingw-w64-static/PKGBUILD | 4 ++-- qt5-gamepad/mingw-w64/PKGBUILD | 4 ++-- qt5-graphicaleffects/mingw-w64-static/PKGBUILD | 4 ++-- qt5-graphicaleffects/mingw-w64/PKGBUILD | 4 ++-- qt5-imageformats/mingw-w64-static/PKGBUILD | 4 ++-- qt5-imageformats/mingw-w64/PKGBUILD | 4 ++-- qt5-location/mingw-w64-static/PKGBUILD | 4 ++-- qt5-location/mingw-w64/PKGBUILD | 4 ++-- qt5-multimedia/mingw-w64-static/PKGBUILD | 4 ++-- qt5-multimedia/mingw-w64/PKGBUILD | 4 ++-- qt5-networkauth/mingw-w64-static/PKGBUILD | 4 ++-- qt5-networkauth/mingw-w64/PKGBUILD | 4 ++-- qt5-quickcontrols/mingw-w64-static/PKGBUILD | 4 ++-- qt5-quickcontrols/mingw-w64/PKGBUILD | 4 ++-- qt5-quickcontrols2/mingw-w64-static/PKGBUILD | 4 ++-- qt5-quickcontrols2/mingw-w64/PKGBUILD | 4 ++-- qt5-remoteobjects/mingw-w64-static/PKGBUILD | 4 ++-- qt5-remoteobjects/mingw-w64/PKGBUILD | 4 ++-- qt5-script/mingw-w64-static/PKGBUILD | 4 ++-- qt5-script/mingw-w64/PKGBUILD | 4 ++-- qt5-scxml/mingw-w64-static/PKGBUILD | 4 ++-- qt5-scxml/mingw-w64/PKGBUILD | 4 ++-- qt5-sensors/mingw-w64-static/PKGBUILD | 4 ++-- qt5-sensors/mingw-w64/PKGBUILD | 4 ++-- qt5-serialport/mingw-w64-static/PKGBUILD | 4 ++-- qt5-serialport/mingw-w64/PKGBUILD | 4 ++-- qt5-speech/mingw-w64-static/PKGBUILD | 4 ++-- qt5-speech/mingw-w64/PKGBUILD | 4 ++-- qt5-svg/mingw-w64-static/PKGBUILD | 4 ++-- qt5-svg/mingw-w64/PKGBUILD | 4 ++-- qt5-tools/mingw-w64-static/PKGBUILD | 4 ++-- qt5-tools/mingw-w64/PKGBUILD | 4 ++-- qt5-translations/mingw-w64/PKGBUILD | 4 ++-- qt5-virtualkeyboard/mingw-w64-static/PKGBUILD | 4 ++-- qt5-virtualkeyboard/mingw-w64/PKGBUILD | 4 ++-- qt5-webchannel/mingw-w64-static/PKGBUILD | 4 ++-- qt5-webchannel/mingw-w64/PKGBUILD | 4 ++-- qt5-webglplugin/mingw-w64-static/PKGBUILD | 4 ++-- qt5-webglplugin/mingw-w64/PKGBUILD | 4 ++-- qt5-websockets/mingw-w64-static/PKGBUILD | 4 ++-- qt5-websockets/mingw-w64/PKGBUILD | 4 ++-- qt5-winextras/mingw-w64-static/PKGBUILD | 4 ++-- qt5-winextras/mingw-w64/PKGBUILD | 4 ++-- qt5-xmlpatterns/mingw-w64-static/PKGBUILD | 4 ++-- qt5-xmlpatterns/mingw-w64/PKGBUILD | 4 ++-- 62 files changed, 124 insertions(+), 124 deletions(-) diff --git a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep index 3b2399c4..4eb2ce01 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep @@ -236,7 +236,7 @@ build() { % } msg2 'Build qmake and configure' && ../${_pkgfqn}/configure $qt_configure_args - msg2 'Build Qt libraries' && make -j$(nproc) + msg2 'Build Qt libraries' && make popd done @@ -245,7 +245,7 @@ build() { package() { for _arch in ${_architectures}; do cd "$srcdir/${_pkgfqn}" - make install -j$(nproc) -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" + make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE pushd "$srcdir/build-${_arch}/lib" diff --git a/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep b/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep index 1cd052b3..08f2dcdf 100644 --- a/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep +++ b/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep @@ -111,7 +111,7 @@ build() { <%== content_for 'build_config' %>\ ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} <%== content_for 'build_config_before_make' %>\ - make -j$(nproc) + make popd done done @@ -125,7 +125,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install <%== content_for 'package_config_after_install' %>\ % unless ($no_libraries) { diff --git a/qt5-3d/mingw-w64-static/PKGBUILD b/qt5-3d/mingw-w64-static/PKGBUILD index ca12200c..e22d49d0 100644 --- a/qt5-3d/mingw-w64-static/PKGBUILD +++ b/qt5-3d/mingw-w64-static/PKGBUILD @@ -60,7 +60,7 @@ build() { make qmake_all find ./tools -type f -iname 'Makefile' -exec sed -i "s|-lQt5Bootstrap|-L/usr/$_arch/lib -lQt5Bootstrap|g" {} \; - make -j$(nproc) + make popd done done @@ -73,7 +73,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD index 4e8236b3..8b420ddb 100644 --- a/qt5-3d/mingw-w64/PKGBUILD +++ b/qt5-3d/mingw-w64/PKGBUILD @@ -59,7 +59,7 @@ build() { make qmake_all find ./tools -type f -iname 'Makefile' -exec sed -i "s|-lQt5Bootstrap|-L/usr/$_arch/lib -lQt5Bootstrap|g" {} \; - make -j$(nproc) + make popd done done @@ -72,7 +72,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD index 870d5e79..ff212035 100644 --- a/qt5-activeqt/mingw-w64/PKGBUILD +++ b/qt5-activeqt/mingw-w64/PKGBUILD @@ -65,7 +65,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -78,7 +78,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD index ecacd4af..08619b53 100644 --- a/qt5-base/mingw-w64-static/PKGBUILD +++ b/qt5-base/mingw-w64-static/PKGBUILD @@ -215,7 +215,7 @@ build() { export OPENSSL_LIBS="/usr/${_arch}/lib/libssl.a /usr/${_arch}/lib/libcrypto.a -lws2_32 -lgdi32 -lcrypt32 -ldnsapi -liphlpapi" msg2 'Build qmake and configure' && ../${_pkgfqn}/configure $qt_configure_args - msg2 'Build Qt libraries' && make -j$(nproc) + msg2 'Build Qt libraries' && make popd done @@ -224,7 +224,7 @@ build() { package() { for _arch in ${_architectures}; do cd "$srcdir/${_pkgfqn}" - make install -j$(nproc) -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" + make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE pushd "$srcdir/build-${_arch}/lib" diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD index 3b9498c0..83691c57 100644 --- a/qt5-base/mingw-w64/PKGBUILD +++ b/qt5-base/mingw-w64/PKGBUILD @@ -219,7 +219,7 @@ build() { #export LDFLAGS="-L$PWD/lib" msg2 'Build qmake and configure' && ../${_pkgfqn}/configure $qt_configure_args - msg2 'Build Qt libraries' && make -j$(nproc) + msg2 'Build Qt libraries' && make popd done @@ -228,7 +228,7 @@ build() { package() { for _arch in ${_architectures}; do cd "$srcdir/${_pkgfqn}" - make install -j$(nproc) -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" + make install -C ../build-${_arch} INSTALL_ROOT="${pkgdir}" # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE pushd "$srcdir/build-${_arch}/lib" diff --git a/qt5-canvas3d/mingw-w64-static/PKGBUILD b/qt5-canvas3d/mingw-w64-static/PKGBUILD index abbc437f..fb8bbc06 100644 --- a/qt5-canvas3d/mingw-w64-static/PKGBUILD +++ b/qt5-canvas3d/mingw-w64-static/PKGBUILD @@ -36,7 +36,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -49,7 +49,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # ensure to get the import lib, too [[ "${_config##*=}" == 'shared' ]] && diff --git a/qt5-canvas3d/mingw-w64/PKGBUILD b/qt5-canvas3d/mingw-w64/PKGBUILD index 5780ed29..be6af017 100644 --- a/qt5-canvas3d/mingw-w64/PKGBUILD +++ b/qt5-canvas3d/mingw-w64/PKGBUILD @@ -35,7 +35,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -48,7 +48,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # ensure to get the import lib, too [[ "${_config##*=}" == 'shared' ]] && diff --git a/qt5-charts/mingw-w64-static/PKGBUILD b/qt5-charts/mingw-w64-static/PKGBUILD index 1f9d2648..5858ddb6 100644 --- a/qt5-charts/mingw-w64-static/PKGBUILD +++ b/qt5-charts/mingw-w64-static/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD index 447ad668..7dd89be5 100644 --- a/qt5-charts/mingw-w64/PKGBUILD +++ b/qt5-charts/mingw-w64/PKGBUILD @@ -48,7 +48,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -61,7 +61,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-connectivity/mingw-w64-static/PKGBUILD b/qt5-connectivity/mingw-w64-static/PKGBUILD index 3ab536c4..2368da3b 100644 --- a/qt5-connectivity/mingw-w64-static/PKGBUILD +++ b/qt5-connectivity/mingw-w64-static/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD index 4452919a..8f8786b1 100644 --- a/qt5-connectivity/mingw-w64/PKGBUILD +++ b/qt5-connectivity/mingw-w64/PKGBUILD @@ -48,7 +48,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -61,7 +61,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-datavis3d/mingw-w64-static/PKGBUILD b/qt5-datavis3d/mingw-w64-static/PKGBUILD index 22925d87..ce6c9bd1 100644 --- a/qt5-datavis3d/mingw-w64-static/PKGBUILD +++ b/qt5-datavis3d/mingw-w64-static/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD index dee6b1d7..aba000fb 100644 --- a/qt5-datavis3d/mingw-w64/PKGBUILD +++ b/qt5-datavis3d/mingw-w64/PKGBUILD @@ -48,7 +48,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -61,7 +61,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-declarative/mingw-w64-static/PKGBUILD b/qt5-declarative/mingw-w64-static/PKGBUILD index ab2bdc47..8593342e 100644 --- a/qt5-declarative/mingw-w64-static/PKGBUILD +++ b/qt5-declarative/mingw-w64-static/PKGBUILD @@ -65,7 +65,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -78,7 +78,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD index cab614d3..169c010e 100644 --- a/qt5-declarative/mingw-w64/PKGBUILD +++ b/qt5-declarative/mingw-w64/PKGBUILD @@ -64,7 +64,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -77,7 +77,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-gamepad/mingw-w64-static/PKGBUILD b/qt5-gamepad/mingw-w64-static/PKGBUILD index 3db372f3..569b1e0c 100644 --- a/qt5-gamepad/mingw-w64-static/PKGBUILD +++ b/qt5-gamepad/mingw-w64-static/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD index 31dfab5a..8a670368 100644 --- a/qt5-gamepad/mingw-w64/PKGBUILD +++ b/qt5-gamepad/mingw-w64/PKGBUILD @@ -48,7 +48,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -61,7 +61,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-graphicaleffects/mingw-w64-static/PKGBUILD b/qt5-graphicaleffects/mingw-w64-static/PKGBUILD index 3bbbfc6c..b5062a3a 100644 --- a/qt5-graphicaleffects/mingw-w64-static/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64-static/PKGBUILD @@ -50,7 +50,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -63,7 +63,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD index 6bd49469..941bf802 100644 --- a/qt5-graphicaleffects/mingw-w64/PKGBUILD +++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-imageformats/mingw-w64-static/PKGBUILD b/qt5-imageformats/mingw-w64-static/PKGBUILD index 1a43c6ac..620f8816 100644 --- a/qt5-imageformats/mingw-w64-static/PKGBUILD +++ b/qt5-imageformats/mingw-w64-static/PKGBUILD @@ -55,7 +55,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -68,7 +68,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD index 2e27236b..fc80c1af 100644 --- a/qt5-imageformats/mingw-w64/PKGBUILD +++ b/qt5-imageformats/mingw-w64/PKGBUILD @@ -54,7 +54,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -67,7 +67,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-location/mingw-w64-static/PKGBUILD b/qt5-location/mingw-w64-static/PKGBUILD index 33a96805..24a88d5e 100644 --- a/qt5-location/mingw-w64-static/PKGBUILD +++ b/qt5-location/mingw-w64-static/PKGBUILD @@ -55,7 +55,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -68,7 +68,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD index be4b2c4d..831043de 100644 --- a/qt5-location/mingw-w64/PKGBUILD +++ b/qt5-location/mingw-w64/PKGBUILD @@ -54,7 +54,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -67,7 +67,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-multimedia/mingw-w64-static/PKGBUILD b/qt5-multimedia/mingw-w64-static/PKGBUILD index d5324fe8..5b5c4b9c 100644 --- a/qt5-multimedia/mingw-w64-static/PKGBUILD +++ b/qt5-multimedia/mingw-w64-static/PKGBUILD @@ -63,7 +63,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -76,7 +76,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD index 23e5feba..a3b83603 100644 --- a/qt5-multimedia/mingw-w64/PKGBUILD +++ b/qt5-multimedia/mingw-w64/PKGBUILD @@ -62,7 +62,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -75,7 +75,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-networkauth/mingw-w64-static/PKGBUILD b/qt5-networkauth/mingw-w64-static/PKGBUILD index 395d4b4a..254920b7 100644 --- a/qt5-networkauth/mingw-w64-static/PKGBUILD +++ b/qt5-networkauth/mingw-w64-static/PKGBUILD @@ -50,7 +50,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -63,7 +63,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD index 0fca766f..01af38b1 100644 --- a/qt5-networkauth/mingw-w64/PKGBUILD +++ b/qt5-networkauth/mingw-w64/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-quickcontrols/mingw-w64-static/PKGBUILD b/qt5-quickcontrols/mingw-w64-static/PKGBUILD index f5b62913..880e6bae 100644 --- a/qt5-quickcontrols/mingw-w64-static/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64-static/PKGBUILD @@ -50,7 +50,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -63,7 +63,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD index e32adc74..885af477 100644 --- a/qt5-quickcontrols/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols/mingw-w64/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-quickcontrols2/mingw-w64-static/PKGBUILD b/qt5-quickcontrols2/mingw-w64-static/PKGBUILD index dfabcaaf..282e270e 100644 --- a/qt5-quickcontrols2/mingw-w64-static/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64-static/PKGBUILD @@ -51,7 +51,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -64,7 +64,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD index 25810a52..780c9b03 100644 --- a/qt5-quickcontrols2/mingw-w64/PKGBUILD +++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD @@ -50,7 +50,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -63,7 +63,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-remoteobjects/mingw-w64-static/PKGBUILD b/qt5-remoteobjects/mingw-w64-static/PKGBUILD index be62d6cc..e2662668 100644 --- a/qt5-remoteobjects/mingw-w64-static/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64-static/PKGBUILD @@ -61,7 +61,7 @@ build() { # avoid `.obj/release/qconnectionfactories.o:qconnectionfactories.cpp:(.text.unlikely+0xf): relocation truncated to fit: IMAGE_REL_AMD64_REL32 against undefined symbol `__cxa_pure_virtual'` [[ $_arch == x86_64-w64-mingw32 ]] && find . -type f -iname 'Makefile*' -exec sed -i 's|\(CXX.*\)\( -o .obj/release/qconnectionfactories.o\)|\1 -mcmodel=large \2|g' {} \; - make -j$(nproc) + make popd done done @@ -74,7 +74,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD index 1bd7f0af..27473d89 100644 --- a/qt5-remoteobjects/mingw-w64/PKGBUILD +++ b/qt5-remoteobjects/mingw-w64/PKGBUILD @@ -60,7 +60,7 @@ build() { # avoid `.obj/release/qconnectionfactories.o:qconnectionfactories.cpp:(.text.unlikely+0xf): relocation truncated to fit: IMAGE_REL_AMD64_REL32 against undefined symbol `__cxa_pure_virtual'` [[ $_arch == x86_64-w64-mingw32 ]] && find . -type f -iname 'Makefile*' -exec sed -i 's|\(CXX.*\)\( -o .obj/release/qconnectionfactories.o\)|\1 -mcmodel=large \2|g' {} \; - make -j$(nproc) + make popd done done @@ -73,7 +73,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-script/mingw-w64-static/PKGBUILD b/qt5-script/mingw-w64-static/PKGBUILD index 946993f1..97acf3c1 100644 --- a/qt5-script/mingw-w64-static/PKGBUILD +++ b/qt5-script/mingw-w64-static/PKGBUILD @@ -42,7 +42,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -55,7 +55,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD index e2a8deb0..ff0ebd66 100644 --- a/qt5-script/mingw-w64/PKGBUILD +++ b/qt5-script/mingw-w64/PKGBUILD @@ -41,7 +41,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -54,7 +54,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-scxml/mingw-w64-static/PKGBUILD b/qt5-scxml/mingw-w64-static/PKGBUILD index 53eae873..492ab486 100644 --- a/qt5-scxml/mingw-w64-static/PKGBUILD +++ b/qt5-scxml/mingw-w64-static/PKGBUILD @@ -54,7 +54,7 @@ build() { make qmake_all find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib -L/usr/$_arch/lib -lQt5Bootstrap|g" {} \; - make -j$(nproc) + make popd done done @@ -67,7 +67,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD index 02c7ea21..d2cd82bd 100644 --- a/qt5-scxml/mingw-w64/PKGBUILD +++ b/qt5-scxml/mingw-w64/PKGBUILD @@ -53,7 +53,7 @@ build() { make qmake_all find . -type f -iname 'Makefile' -exec sed -i "s|-L/usr/$_arch/lib -lQt5Bootstrap|-L/usr/lib -L/usr/$_arch/lib -lQt5Bootstrap|g" {} \; - make -j$(nproc) + make popd done done @@ -66,7 +66,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-sensors/mingw-w64-static/PKGBUILD b/qt5-sensors/mingw-w64-static/PKGBUILD index 4d8f44aa..960cb213 100644 --- a/qt5-sensors/mingw-w64-static/PKGBUILD +++ b/qt5-sensors/mingw-w64-static/PKGBUILD @@ -50,7 +50,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -63,7 +63,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD index 44d8fa30..0cdecdce 100644 --- a/qt5-sensors/mingw-w64/PKGBUILD +++ b/qt5-sensors/mingw-w64/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-serialport/mingw-w64-static/PKGBUILD b/qt5-serialport/mingw-w64-static/PKGBUILD index 2dc43915..402106a0 100644 --- a/qt5-serialport/mingw-w64-static/PKGBUILD +++ b/qt5-serialport/mingw-w64-static/PKGBUILD @@ -52,7 +52,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -65,7 +65,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD index f271a950..19228695 100644 --- a/qt5-serialport/mingw-w64/PKGBUILD +++ b/qt5-serialport/mingw-w64/PKGBUILD @@ -51,7 +51,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -64,7 +64,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-speech/mingw-w64-static/PKGBUILD b/qt5-speech/mingw-w64-static/PKGBUILD index 74c3a4ef..f3c74704 100644 --- a/qt5-speech/mingw-w64-static/PKGBUILD +++ b/qt5-speech/mingw-w64-static/PKGBUILD @@ -53,7 +53,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -66,7 +66,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD index c8f94b81..76df147b 100644 --- a/qt5-speech/mingw-w64/PKGBUILD +++ b/qt5-speech/mingw-w64/PKGBUILD @@ -52,7 +52,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -65,7 +65,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-svg/mingw-w64-static/PKGBUILD b/qt5-svg/mingw-w64-static/PKGBUILD index f4ede68c..8c88d53e 100644 --- a/qt5-svg/mingw-w64-static/PKGBUILD +++ b/qt5-svg/mingw-w64-static/PKGBUILD @@ -50,7 +50,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -63,7 +63,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD index 83129338..388698d8 100644 --- a/qt5-svg/mingw-w64/PKGBUILD +++ b/qt5-svg/mingw-w64/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-tools/mingw-w64-static/PKGBUILD b/qt5-tools/mingw-w64-static/PKGBUILD index 4ee7af9d..64983e77 100644 --- a/qt5-tools/mingw-w64-static/PKGBUILD +++ b/qt5-tools/mingw-w64-static/PKGBUILD @@ -70,7 +70,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -83,7 +83,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD index 7236fe4f..0008360c 100644 --- a/qt5-tools/mingw-w64/PKGBUILD +++ b/qt5-tools/mingw-w64/PKGBUILD @@ -69,7 +69,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -82,7 +82,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD index 2e5bfbaa..3bb8b22f 100644 --- a/qt5-translations/mingw-w64/PKGBUILD +++ b/qt5-translations/mingw-w64/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install popd done done diff --git a/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD b/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD index 3f877f2f..fb7b334c 100644 --- a/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64-static/PKGBUILD @@ -59,7 +59,7 @@ build() { make qmake_all find . \( -type f -name 'Makefile*' -o -name '*.prl' \) -exec sed -i "$_fix_deps_of_static_3rdparty_libs" {} \; -exec touch -d 300101 {} \; - make -j$(nproc) + make popd done done @@ -72,7 +72,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # apply the fix for the dependency order like in build find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "$_fix_deps_of_static_3rdparty_libs" {} \; diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD index d720a9f9..fb8558e0 100644 --- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD +++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD @@ -58,7 +58,7 @@ build() { make qmake_all find . \( -type f -name 'Makefile*' -o -name '*.prl' \) -exec sed -i "$_fix_deps_of_static_3rdparty_libs" {} \; -exec touch -d 300101 {} \; - make -j$(nproc) + make popd done done @@ -71,7 +71,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # apply the fix for the dependency order like in build find "${pkgdir}/usr/${_arch}/lib" \( -type f -name '*.prl' -o -name '*.pc' \) -exec sed -i -e "$_fix_deps_of_static_3rdparty_libs" {} \; diff --git a/qt5-webchannel/mingw-w64-static/PKGBUILD b/qt5-webchannel/mingw-w64-static/PKGBUILD index e6d54d1b..83cc292b 100644 --- a/qt5-webchannel/mingw-w64-static/PKGBUILD +++ b/qt5-webchannel/mingw-w64-static/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD index 361be972..051122d8 100644 --- a/qt5-webchannel/mingw-w64/PKGBUILD +++ b/qt5-webchannel/mingw-w64/PKGBUILD @@ -48,7 +48,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -61,7 +61,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-webglplugin/mingw-w64-static/PKGBUILD b/qt5-webglplugin/mingw-w64-static/PKGBUILD index 27187d5b..001773fa 100644 --- a/qt5-webglplugin/mingw-w64-static/PKGBUILD +++ b/qt5-webglplugin/mingw-w64-static/PKGBUILD @@ -58,7 +58,7 @@ build() { mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} _additional_qmake_args=QT_INSTALL_PREFIX=/usr/${_arch} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -71,7 +71,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD b/qt5-webglplugin/mingw-w64/PKGBUILD index 99422e99..d34e0c24 100644 --- a/qt5-webglplugin/mingw-w64/PKGBUILD +++ b/qt5-webglplugin/mingw-w64/PKGBUILD @@ -57,7 +57,7 @@ build() { mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} _additional_qmake_args=QT_INSTALL_PREFIX=/usr/${_arch} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -70,7 +70,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-websockets/mingw-w64-static/PKGBUILD b/qt5-websockets/mingw-w64-static/PKGBUILD index 8c6f0650..ba07ee3d 100644 --- a/qt5-websockets/mingw-w64-static/PKGBUILD +++ b/qt5-websockets/mingw-w64-static/PKGBUILD @@ -50,7 +50,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -63,7 +63,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD index 53c38cf8..dae18e12 100644 --- a/qt5-websockets/mingw-w64/PKGBUILD +++ b/qt5-websockets/mingw-w64/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-winextras/mingw-w64-static/PKGBUILD b/qt5-winextras/mingw-w64-static/PKGBUILD index 97b6834c..0b4f1155 100644 --- a/qt5-winextras/mingw-w64-static/PKGBUILD +++ b/qt5-winextras/mingw-w64-static/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD index 5b9e1c32..b5ef3219 100644 --- a/qt5-winextras/mingw-w64/PKGBUILD +++ b/qt5-winextras/mingw-w64/PKGBUILD @@ -48,7 +48,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -61,7 +61,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-xmlpatterns/mingw-w64-static/PKGBUILD b/qt5-xmlpatterns/mingw-w64-static/PKGBUILD index 684ba2f7..ec8e4041 100644 --- a/qt5-xmlpatterns/mingw-w64-static/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64-static/PKGBUILD @@ -49,7 +49,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -62,7 +62,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD index ef28a0c0..46fe9440 100644 --- a/qt5-xmlpatterns/mingw-w64/PKGBUILD +++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD @@ -48,7 +48,7 @@ build() { msg2 "Building ${_config##*=} version for ${_arch}" mkdir -p build-${_arch}-${_config##*=} && pushd build-${_arch}-${_config##*=} ${_arch}-qmake-qt5 ../${_qt_module}.pro ${_config} ${_additional_qmake_args} - make -j$(nproc) + make popd done done @@ -61,7 +61,7 @@ package() { for _config in "${_configurations[@]}"; do pushd build-${_arch}-${_config##*=} - make -j$(nproc) INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT="$pkgdir" install # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE if [[ -d 'lib' ]]; then