From ba8257a4905ac762b0a3739c59130d376ed95e42 Mon Sep 17 00:00:00 2001 From: Juncheng Yang <1a1a11a@users.noreply.github.com> Date: Sat, 18 Feb 2023 19:31:28 +0000 Subject: [PATCH 1/3] remove cmake from the default apt install `CheckLinkerFlag` requires CMake 3.18, but the default cmake in Ubuntu20 is 3.16, installing the default often shadow the customized cmake --- contrib/prerequisites-ubuntu18.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/contrib/prerequisites-ubuntu18.sh b/contrib/prerequisites-ubuntu18.sh index 3b7faf3ae2..33931403bf 100755 --- a/contrib/prerequisites-ubuntu18.sh +++ b/contrib/prerequisites-ubuntu18.sh @@ -18,7 +18,6 @@ sudo apt-get install -y \ build-essential \ git \ g++ \ - cmake \ bison flex \ libboost-all-dev \ libevent-dev \ From 8b37a33dd071dd9e14f754982aa594265d0b5067 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 18 Feb 2023 17:44:57 -0500 Subject: [PATCH 2/3] fix parallel compilation: previously it was not parallel --- contrib/build-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/build-package.sh b/contrib/build-package.sh index ff487967cb..3ca48cd33f 100755 --- a/contrib/build-package.sh +++ b/contrib/build-package.sh @@ -259,7 +259,7 @@ test "$debug_build" \ MAKE_PARAMS= test "$verbose" && MAKE_PARAMS="$MAKE_PARAMS VERBOSE=YES" -JOBS=$(nproc --ignore 1) +JOBS=$(nproc --all --ignore 1) test "$many_jobs" && MAKE_PARAMS="$MAKE_PARAMS -j$JOBS" From da498d7d6100ecd0f6604a6bf2a1d9e0a981ec3a Mon Sep 17 00:00:00 2001 From: Juncheng Yang <1a1a11a@users.noreply.github.com> Date: Wed, 22 Feb 2023 19:11:29 +0000 Subject: [PATCH 3/3] add cmake --- contrib/prerequisites-ubuntu18.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/prerequisites-ubuntu18.sh b/contrib/prerequisites-ubuntu18.sh index 33931403bf..3b7faf3ae2 100755 --- a/contrib/prerequisites-ubuntu18.sh +++ b/contrib/prerequisites-ubuntu18.sh @@ -18,6 +18,7 @@ sudo apt-get install -y \ build-essential \ git \ g++ \ + cmake \ bison flex \ libboost-all-dev \ libevent-dev \