From 920aac42684b47167fc2532fde0f1ebbb1069ebc Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:54:55 -0400 Subject: [PATCH 1/4] use /usr/bin/env to find bash --- scripts/install_deps.sh | 2 +- scripts/pinned_build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index 59ae8b69ee..e2bab6d69c 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -1,4 +1,4 @@ -#! /usr/bin/bash +#!/usr/bin/env bash apt-get update apt-get update --fix-missing diff --git a/scripts/pinned_build.sh b/scripts/pinned_build.sh index dc55ef1241..559018ed2b 100755 --- a/scripts/pinned_build.sh +++ b/scripts/pinned_build.sh @@ -1,4 +1,4 @@ -#! /usr/bin/bash +#!/usr/bin/env bash echo "Mandel Pinned Build" From ecdb730ee2bfc4dd41e3f9045080a3bcaa41c36b Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:57:04 -0400 Subject: [PATCH 2/4] don't use cmake -S as that doesn't work on cmake 3.10 --- scripts/pinned_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pinned_build.sh b/scripts/pinned_build.sh index 559018ed2b..fcae2967b6 100755 --- a/scripts/pinned_build.sh +++ b/scripts/pinned_build.sh @@ -130,7 +130,7 @@ pushdir ${MANDEL_DIR} # build Mandel echo "Building Mandel ${SCRIPT_DIR}" -try cmake -DCMAKE_TOOLCHAIN_FILE=${SCRIPT_DIR}/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=${LLVM_DIR}/lib/cmake -DCMAKE_PREFIX_PATH=${BOOST_DIR}/bin -S${SCRIPT_DIR}/.. +try cmake -DCMAKE_TOOLCHAIN_FILE=${SCRIPT_DIR}/pinned_toolchain.cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=${LLVM_DIR}/lib/cmake -DCMAKE_PREFIX_PATH=${BOOST_DIR}/bin ${SCRIPT_DIR}/.. try make -j${JOBS} try cpack From cfdce0133f12485dda64da99a254c822b95ca9da Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:58:42 -0400 Subject: [PATCH 3/4] remove unused LIBPQXX variable --- scripts/pinned_build.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/pinned_build.sh b/scripts/pinned_build.sh index fcae2967b6..bae29d9576 100755 --- a/scripts/pinned_build.sh +++ b/scripts/pinned_build.sh @@ -31,7 +31,6 @@ JOBS=$3 CLANG_VER=11.0.1 BOOST_VER=1.70.0 LLVM_VER=7.1.0 -LIBPQXX_VER=7.2.1 ARCH=`uname -m` SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]:-$0}"; )" &> /dev/null && pwd 2> /dev/null; )"; START_DIR="$(pwd)" From a4fa84d0d1c54a4d3aedec69ef9220600d38aced Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Fri, 24 Jun 2022 14:02:21 -0400 Subject: [PATCH 4/4] add python3 in install_deps.sh --- scripts/install_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh index e2bab6d69c..89cceed969 100755 --- a/scripts/install_deps.sh +++ b/scripts/install_deps.sh @@ -3,4 +3,4 @@ apt-get update apt-get update --fix-missing DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata -apt-get -y install zip unzip libncurses5 wget git build-essential cmake curl libcurl4-openssl-dev libgmp-dev libssl-dev libusb-1.0.0-dev libzstd-dev time pkg-config zlib1g-dev libtinfo-dev bzip2 libbz2-dev +apt-get -y install zip unzip libncurses5 wget git build-essential cmake curl libcurl4-openssl-dev libgmp-dev libssl-dev libusb-1.0.0-dev libzstd-dev time pkg-config zlib1g-dev libtinfo-dev bzip2 libbz2-dev python3