update build script, hopefully fix llbase error

1 files changed, 52 insertions, 40 deletions

diff --git a/build_linux64.bash b/build_linux64.bash
index 15bb83c2e1d3..2275061867f5 100755
--- a/build_linux64.bash
+++ b/build_linux64.bash
@@ -1,41 +1,53 @@
-    virtualenv ".venv" -p python3
-    source ".venv/bin/activate"
-    pip install --upgrade certifi
-    if command -v autobuild && \
-			[ $(autobuild --version | cut -d ' ' -f 2 | tr -d '.') -gt 210 ]
-		then
-			echo "Found Autobuild"
-    else
-				pip3 install autobuild -i https://git.alchemyviewer.org/api/v4/projects/54/packages/pypi/simple --extra-index-url https://pypi.org/simple
-    fi
-    # we have a lot of files, relax ulimit to help performance
-    ulimit -n 20000
-    # shellcheck disable=SC2153
-		# LTO is currently very broken for alchemy
-    #autobuild configure -A 64 -c ReleaseOS -- -DLL_TESTS:BOOL=OFF -DDISABLE_FATAL_WARNINGS=ON -DUSE_LTO:BOOL="$(grep -cq '[^!]lto' <<< "${1}" && echo 'ON' || echo 'OFF')" -DVIEWER_CHANNEL="Alchemy Test"
-    autobuild configure -A 64 -c ReleaseOS -- -DLL_TESTS:BOOL=OFF -DDISABLE_FATAL_WARNINGS=ON -DUSE_LTO:BOOL=OFF -DVIEWER_CHANNEL="Alchemy Test"
-    cd "build-linux-64" || exit 1
-    jobcount=$(nproc)
-    if [[ ${jobcount} -gt 1 ]]; then
-			#if false; then
-        # The viewer requires an average of 4GB of memory per CPU core to sucessfully link
-        mempercorekb=$((4 * 1048576))
-        requiredmemorykb=$(($(nproc) * mempercorekb))
-        availablememorykb=$(grep MemTotal /proc/meminfo | tr -s ' ' | cut -d ' ' -f 2)
-        #freememkb="$(grep MemFree /proc/meminfo | tr -s ' ' | cut -d ' ' -f 2)"
-        if [[ ${requiredmemorykb} -gt ${availablememorykb} ]]; then
-        jobs=0
-        until [[ $(((jobs + 1) * mempercorekb)) -gt ${availablememorykb} ]]; do
-           jobs=$((jobs+1))
-        done
-        #((jobs--))
-        jobcount=${jobs}
-		#fi
-        elif [[ ${jobcount} -le 8 ]]; then
-           jobcount=$((jobcount - 1))
-        else
-           jobcount=$((jobcount - 2))
-        fi
-    fi
-    echo "Building with ${jobcount} jobs (adjusted)"
+#!/usr/bin/env bash
+virtualenv ".venv" -p python3
+source ".venv/bin/activate"
+pip install --upgrade certifi
+#if command -v autobuild && \
+#	[ "$(autobuild --version | cut -d ' ' -f 2 | tr -d '.')" -gt 210 ]
+#then
+#	echo "Found Autobuild"
+#else
+	pip3 install --upgrade llbase
+	pip3 install --upgrade autobuild -i \
+		https://git.alchemyviewer.org/api/v4/projects/54/packages/pypi/simple \
+		--extra-index-url https://pypi.org/simple
+#fi
+# we have a lot of files, relax ulimit to help performance
+ulimit -n 20000
+# shellcheck disable=SC2153
+# LTO is currently very broken for alchemy
+#autobuild configure -A 64 -c ReleaseOS -- \
+#	-DLL_TESTS:BOOL=OFF \
+#	-DDISABLE_FATAL_WARNINGS=ON \
+#	-DUSE_LTO:BOOL="$(grep -cq '[^!]lto' <<< "${1}" && echo 'ON' || echo 'OFF')" \
+#	-DVIEWER_CHANNEL="Alchemy Test"
+autobuild configure -A 64 -c ReleaseOS -- \
+	-DLL_TESTS:BOOL=OFF \
+	-DDISABLE_FATAL_WARNINGS=ON \
+	-DUSE_LTO:BOOL=OFF \
+	-DVIEWER_CHANNEL="Alchemy Test"
+cd "build-linux-64" || exit 1
+jobcount=$(nproc)
+if [[ ${jobcount} -gt 1 ]]; then
+	#if false; then
+		# The viewer requires an average of 4GB of memory per core to link
+		mempercorekb=$((4 * 1048576))
+		requiredmemorykb=$(($(nproc) * mempercorekb))
+		availablememorykb=$(grep MemTotal /proc/meminfo|tr -s ' '|cut -d ' ' -f 2)
+		#freememkb="$(grep MemFree /proc/meminfo | tr -s ' ' | cut -d ' ' -f 2)"
+		if [[ ${requiredmemorykb} -gt ${availablememorykb} ]]; then
+			jobs=0
+      until [[ $(((jobs + 1) * mempercorekb)) -gt ${availablememorykb} ]]; do
+				jobs=$((jobs+1))
+      done
+      #((jobs--))
+      jobcount=${jobs}
+	#fi
+		elif [[ ${jobcount} -le 8 ]]; then
+			jobcount=$((jobcount - 1))
+		else
+			jobcount=$((jobcount - 2))
+		fi
+fi
+echo "Building with ${jobcount} jobs (adjusted)"
 time ninja -j${jobcount}