attempt to set --jobs flag for GNU Make dynamically

2025-04-14 00:48:14 +08:00
parent 907b9a2c1a
commit 2c583c08e2
15 changed files with 17 additions and 15 deletions
--- a/.gitea/workflows/build-jupyterhub.yaml
+++ b/.gitea/workflows/build-jupyterhub.yaml
@@ -6,7 +6,7 @@ on:
      - 'jupyterhub/**'
      - '.gitea/workflows/build-jupyterhub.yaml'      
 jobs:
-  "Build wildfly docker images":
+  "Build jupyterhub docker images":
    runs-on: woryzen
    steps:
      -
--- a/.gitea/workflows/build-wildfly.yaml
+++ b/.gitea/workflows/build-wildfly.yaml
@@ -22,7 +22,7 @@ jobs:
          username: woggioni
          password: ${{ secrets.PUBLISHER_TOKEN }}
      -
-        name: Build and push jenkins-agent images
+        name: Build and push wildfly images
        uses: docker/build-push-action@v6
        with:
          context: "{{defaultContext}}:wildfly"
--- a/arch-builder/makepkg/makepkg-aarch64.conf
+++ b/arch-builder/makepkg/makepkg-aarch64.conf
@@ -49,7 +49,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-armv7h.conf
+++ b/arch-builder/makepkg/makepkg-armv7h.conf
@@ -46,7 +46,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-goldmont.conf
+++ b/arch-builder/makepkg/makepkg-goldmont.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-native.conf
+++ b/arch-builder/makepkg/makepkg-native.conf
@@ -44,7 +44,7 @@ LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
 LTOFLAGS="-flto=auto"

 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-sandybridge.conf
+++ b/arch-builder/makepkg/makepkg-sandybridge.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-silvermont.conf
+++ b/arch-builder/makepkg/makepkg-silvermont.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-skylake.conf
+++ b/arch-builder/makepkg/makepkg-skylake.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-tigerlake.conf
+++ b/arch-builder/makepkg/makepkg-tigerlake.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-znver1.conf
+++ b/arch-builder/makepkg/makepkg-znver1.conf
@@ -48,7 +48,8 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
+
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-znver2.conf
+++ b/arch-builder/makepkg/makepkg-znver2.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-znver3.conf
+++ b/arch-builder/makepkg/makepkg-znver3.conf
@@ -48,7 +48,8 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
+
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg-znver5.conf
+++ b/arch-builder/makepkg/makepkg-znver5.conf
@@ -48,7 +48,7 @@ LTOFLAGS="-flto=auto"

 #RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"
--- a/arch-builder/makepkg/makepkg.conf
+++ b/arch-builder/makepkg/makepkg.conf
@@ -46,7 +46,7 @@ LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
         -Wl,-z,pack-relative-relocs"
 LTOFLAGS="-flto=auto"
 #-- Make Flags: change this for DistCC/SMP systems
-MAKEFLAGS="-j4"
+MAKEFLAGS="--jobs=$(nproc)"
 #-- Debugging flags
 DEBUG_CFLAGS="-g -fvar-tracking-assignments"
 DEBUG_CXXFLAGS="-g -fvar-tracking-assignments"