From c2b515c1d39ff4711c1e677df46f634cd955bfe0 Mon Sep 17 00:00:00 2001
From: Silvino <silvino@bk.ru>
Date: Tue, 11 Jun 2019 04:34:38 +0100
Subject: fix pkgmk.conf distcc pump mode

---
 core/conf/pkgmk.conf | 15 ++++++++-------
 core/ports.html      | 24 ++++++++++++++----------
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/core/conf/pkgmk.conf b/core/conf/pkgmk.conf
index eb2d573..8222926 100644
--- a/core/conf/pkgmk.conf
+++ b/core/conf/pkgmk.conf
@@ -5,27 +5,28 @@
 export CFLAGS="-O2 -march=x86-64"
 export CXXFLAGS="${CFLAGS}"
 
-### ccache settings
+## ccache settings
 #export PATH="/usr/lib/ccache/:$PATH"
 #export CCACHE_DIR="/usr/ports/ccache"
 #export CCACHE_PREFIX="distcc"
 #export CCACHE_COMPILERCHECK="%compiler% -dumpversion; crux"
-#export DISTCC_DIR="/usr/ports/distcc"
 #
 ## compile using ccache and distcc
-#PUMP_BUILD=no
 #export DISTCC_HOSTS="localhost/4 xborg/4"
 #
-## compile using distcc without ccache
+### compile using distcc without ccache
 ##export PATH="/usr/lib/distcc/:$PATH"
-##export DISTCC_HOSTS="localhost/4,lzo,cpp xborg/4,lzo,cpp cb1/2,lzo,cpp"
+##export DISTCC_HOSTS="localhost/4,lzo,cpp xborg/4,lzo,cpp"
 ##export PUMP_BUILD=yes
 #
-#export MAKEFLAGS="-j $(/usr/bin/distcc -j 2> /dev/null)"
+## distcc settings
+#export JOBS=$(/usr/bin/distcc -j 2> /dev/null)
+#export DISTCC_DIR="/usr/ports/distcc"
+#export MAKEFLAGS="-j ${JOBS}"
 #export SCONSFLAGS="$MAKEFLAGS"
-export JOBS=$(nproc)
 
 # local compile only
+export JOBS=$(nproc)
 export MAKEFLAGS="-j $JOBS"
 
 case ${PKGMK_ARCH} in
diff --git a/core/ports.html b/core/ports.html
index d7ea41c..bbb8472 100644
--- a/core/ports.html
+++ b/core/ports.html
@@ -199,7 +199,8 @@
         </pre>
 
         <p>Configure pkgmk and define number of cores available,
-        in this example get dynamically Edit /etc/pkgmk.conf and
+        in this example get dynamically Edit 
+        <a href="conf/pkgmk.conf">/etc/pkgmk.conf</a> and
         set ccaching directory and instructs to use distcc
         backend;</p>
 
@@ -216,17 +217,20 @@
         be configured on /etc/hosts.</p>
 
         <pre>
-        export DISTCC_DIR="/usr/ports/distcc"
-
-        # compile using ccache and distcc
-        export DISTCC_HOSTS="localhost/4 xborg/4"
-
-        # compile using distcc without ccache
-        #export PATH="/usr/lib/distcc/:$PATH"
-        #export DISTCC_HOSTS="localhost/4,lzo,cpp xborg/4,lzo,cpp cb1/2,lzo,cpp"
+        ### compile using distcc without ccache
+        ##export PATH="/usr/lib/distcc/:$PATH"
+        ##export DISTCC_HOSTS="localhost/4,lzo,cpp xborg/4,lzo,cpp"
+        ##export PUMP_BUILD=yes
 
-        export MAKEFLAGS="-j $(/usr/bin/distcc -j 2> /dev/null)"
+        # distcc settings
+        export JOBS=$(/usr/bin/distcc -j 2> /dev/null)
+        export DISTCC_DIR="/usr/ports/distcc"
+        export MAKEFLAGS="-j ${JOBS}"
         export SCONSFLAGS="$MAKEFLAGS"
+
+        # local compile only
+        #export JOBS=$(nproc)
+        #export MAKEFLAGS="-j $JOBS"
         </pre>
 
         <p>Configure distcc daemon, edit
-- 
cgit 1.4.1-2-gfad0