From ed95528e8f9e948b5e3a444b6d030393a4e6e63f Mon Sep 17 00:00:00 2001
From: SMLinux <smlinux@pktsurf.in>
Date: Sat, 5 Feb 2022 09:14:52 +0530
Subject: [PATCH] -> Set various defaults in bldpkg.conf ->Added
 SM_CHECKDEPENDENCIES variable in bldpkg.conf and related code in bldpkg to
 toggle whether to   check for build/runtime dependencies

---
 bldpkg      | 38 +++++++++++++++++++++-----------------
 bldpkg.conf | 19 +++++++++++--------
 2 files changed, 32 insertions(+), 25 deletions(-)

diff --git a/bldpkg b/bldpkg
index 9d1e75e..184e580 100755
--- a/bldpkg
+++ b/bldpkg
@@ -508,24 +508,28 @@ else
   exit 1
 fi
   
-# Do a preliminary package dependency check
-echo "Parsing $APP 's dependency list..."
 
-for PACKAGEDEP in $REQUIRES; do
-  DEPCOUNT="$(find /doc -name $PACKAGEDEP.SMBuild | wc -l)"
-  # If count is 1, we are ok
-  if [ "$DEPCOUNT" == "1" ] ; then
-    echo "Found dependency $PACKAGEDEP"
-  # If count is 0, we exit, because we are in trouble
-  elif [ "$DEPCOUNT" == "0" ] ; then
-    echo "Did not find dependency $PACKAGEDEP ! Aborting!"
-    exit 1
-  # If count is greater than or equal to 2, we are in slightly less trouble
-  elif [ "$DEPCOUNT" -ge "2" ] ; then
-    echo "Warning! Found multiple versions of $PACKAGEDEP !"
-    sleep 0.5
-  fi
-done
+# Do a preliminary package dependency check if SM_CHECKDEPENDENCIES is set to 1 in bldpkg.conf
+if [ "$SM_CHECKDEPENDENCIES" == "1" ] ; then
+  
+  echo "Parsing $APP 's dependency list..."
+  for PACKAGEDEP in $REQUIRES; do
+    DEPCOUNT="$(find /doc -name $PACKAGEDEP.SMBuild | wc -l)"
+    # If count is 1, we are ok
+    if [ "$DEPCOUNT" == "1" ] ; then
+      echo "Found dependency $PACKAGEDEP"
+    # If count is 0, we exit, because we are in trouble
+    elif [ "$DEPCOUNT" == "0" ] ; then
+      echo "Did not find dependency $PACKAGEDEP ! Aborting!"
+      exit 1
+    # If count is greater than or equal to 2, we are in slightly less trouble
+    elif [ "$DEPCOUNT" -ge "2" ] ; then
+      echo "Warning! Found multiple versions of $PACKAGEDEP !"
+      sleep 0.5
+    fi
+  done
+
+fi
 
 # If $SM_NOAUTOCONFSITE is unset in an individual package build file, export CONFIG_SITE variable into the build 
 # environment for a package's configure script to pickup. Most autoconf-compatible configure scripts will 
diff --git a/bldpkg.conf b/bldpkg.conf
index b5b4227..22d9218 100644
--- a/bldpkg.conf
+++ b/bldpkg.conf
@@ -1,4 +1,4 @@
-# /etc/bldpkg.conf
+# /etc/buildvars.conf
 # Part of the SMLinux distribution
 
 # This file allows you to define paths and variable values and prepares a 
@@ -31,11 +31,11 @@ SM_EXTRACTPROMPT=0
 
 # Whether to use distcc for distributed compilations. 0 to disable, 1 to 
 # enable.
-SM_GLOBALDISTCC=1
+SM_GLOBALDISTCC=0
 
 # Whether to use ccache for faster consecutive rebuilds. Set 0 to disable, 
 # 1 to enable.
-SM_GLOBALCCACHE=1
+SM_GLOBALCCACHE=0
 
 # Whether to use sccache for faster consecutive builds. Set 0 to disable,
 # 1 to enable.
@@ -77,11 +77,11 @@ DISTCC_IO_TIMEOUT="1800"
 # distcc manual for complete info. Must be defined in /etc/hosts unless they
 # are an IP. Tip: Distcc by default will use only 2 cores on the local 
 # machine.
-DISTCC_HOSTS="--randomize localhost/3 mx/3,lzo"
+DISTCC_HOSTS="--randomize localhost/3 host0/2,lzo"
 
 # Add sum total of the above CPU cores/threads or add your own count 
 # prepended with "-j". 
-SM_CPUTHREADS="-j6"
+SM_CPUTHREADS="-j5"
 
 # Declare a parent temporary directory
 SM_PARENTTMP="/tmp"
@@ -117,7 +117,7 @@ SM_PRESERVEBUILDDIR=1
 SM_PRESERVEPACKAGEDIR=1
 
 # Whether to show build summary. Set to 1 to enable, 0 to disable.
-SM_SHOWSUMMARY=1
+SM_SHOWSUMMARY=0
 
 # Whether to show colours in the build summary. Set 1 to enable, 0 to 
 # disable. Also, only show colours if the build is invoked manually and not 
@@ -126,7 +126,7 @@ SM_SHOWSUMMARY=1
 [ -z "$SM_COLOURS" ] && SM_COLOURS=1
 
 # Define whether to check for swap. 1 to enable, 0 to disable.
-SM_SWAPCHECK=1
+SM_SWAPCHECK=0
 
 # If above variable is set to 1, define minimum swap size required for huge 
 # compiles in KiB
@@ -162,6 +162,9 @@ SM_CONFIGSITE="/etc/config.cache"
 # handled by the mkchecksums script.
 SM_VERIFYCHECKSUMS=0
 
+# Whether to check for build/runtime dependencies
+SM_CHECKDEPENDENCIES=0
+
 # This array lists the packages whose sources will not be extracted and 
 # compiled inside tmpfs, if tmpfs is <= 2GB. If your tmpfs is >= 2GB, empty
 # out this entire list.
@@ -188,5 +191,5 @@ SM_PROTECTEDDIRECTORIES=( "/bin" "/boot" "/dev" "/etc" "/home" "/include" \
 
 # Whether to output application build status in HTML format. Set 1 to enable,
 # 0 to disable.
-SM_HTMLOUTPUT=1
+SM_HTMLOUTPUT=0