Merge branch '2.3' into 2.4

BUILD/build_deb_local.sh

@@ -5,26 +5,25 @@
 
 set -x
 
-cpus=$(grep -c processor /proc/cpuinfo)
-
 cd ./MaxScale
 
+
 mkdir _build
 cd _build
 cmake ..  $cmake_flags
 export LD_LIBRARY_PATH=$PWD/log_manager:$PWD/query_classifier
-make -j $cpus || exit 1
+make || exit 1
 
 if [[ "$cmake_flags" =~ "BUILD_TESTS=Y" ]]
 then
     # We don't care about memory leaks in the tests (e.g. servers are never freed)
     export ASAN_OPTIONS=detect_leaks=0
     # All tests must pass otherwise the build is considered a failure
-    ctest --output-on-failure -j 100 || exit 1
+    ctest --output-on-failure || exit 1
 fi
 
 export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
-make package -j $cpus
+make package
 res=$?
 if [ $res != 0 ] ; then
         echo "Make package failed"
@@ -36,7 +35,7 @@ sudo rm CMakeCache.txt
 
 echo "Building tarball..."
 cmake .. $cmake_flags -DTARBALL=Y
-sudo make package -j $cpus
+sudo make package
 
 
 cp _CPack_Packages/Linux/DEB/*.deb ../
@@ -58,7 +57,7 @@ then
         export LD_LIBRARY_PATH=""
         cmake ..  $cmake_flags -DTARGET_COMPONENT=$component
         export LD_LIBRARY_PATH=$(for i in `find $PWD/ -name '*.so*'`; do echo $(dirname $i); done|sort|uniq|xargs|sed -e 's/[[:space:]]/:/g')
-        make package -j $cpus
+        make package
         cp _CPack_Packages/Linux/DEB/*.deb ../
         cd ..
         cp _build/*.deb .
@@ -69,7 +68,7 @@ fi
 
 if [ "$BUILD_RABBITMQ" == "yes" ] ; then
   cmake ../rabbitmq_consumer/  $cmake_flags
-  sudo make package -j $cpus
+  sudo make package
   res=$?
   if [ $res != 0 ] ; then
         exit $res

BUILD/build_rpm_local.sh

@@ -5,21 +5,19 @@
 
 set -x
 
-cpus=$(grep -c processor /proc/cpuinfo)
-
 cd ./MaxScale
 
 mkdir _build
 cd _build
 cmake ..  $cmake_flags
-make -j $cpus || exit 1
+make || exit 1
 
 if [[ "$cmake_flags" =~ "BUILD_TESTS=Y" ]]
 then
     # We don't care about memory leaks in the tests (e.g. servers are never freed)
     export ASAN_OPTIONS=detect_leaks=0
     # All tests must pass otherwise the build is considered a failure
-    ctest --output-on-failure -j 100 || exit 1
+    ctest --output-on-failure || exit 1
 
     # See if docker is installed and run REST API and MaxCtrl tests if it is
     command -v docker
@@ -43,7 +41,7 @@ sudo rm -rf /usr/bin/strip
 sudo touch /usr/bin/strip
 sudo chmod a+x /usr/bin/strip
 
-sudo make package -j $cpus
+sudo make package
 res=$?
 if [ $res != 0 ] ; then
 	echo "Make package failed"
@@ -55,7 +53,7 @@ sudo rm CMakeCache.txt
 
 echo "Building tarball..."
 cmake .. $cmake_flags -DTARBALL=Y
-sudo make package -j $cpus
+sudo make package
 
 cd ..
 cp _build/*.rpm .
@@ -68,7 +66,7 @@ then
         cd _build
         rm CMakeCache.txt
         cmake ..  $cmake_flags -DTARGET_COMPONENT=$component
-        sudo make package -j $cpus
+        sudo make package
         cd ..
         cp _build/*.rpm .
 	    cp _build/*.gz .
@@ -77,7 +75,7 @@ fi
 
 if [ "$BUILD_RABBITMQ" == "yes" ] ; then
   cmake ../rabbitmq_consumer/  $cmake_flags
-  sudo make package -j $cpus
+  sudo make package
   res=$?
   if [ $res != 0 ] ; then
         exit $res

BUILD/install_build_deps.sh

@@ -6,8 +6,6 @@
 # Build in a temp directory so we don't pollute cwd
 tmpdir=$(mktemp -d)
 
-cpus=$(grep -c processor /proc/cpuinfo)
-
 cd $tmpdir
 
 command -v apt-get
@@ -131,7 +129,7 @@ if [ "`echo -e "3.7.1\n$cmake_version"|sort -V|head -n 1`" != "3.7.1" ] ; then
     cd cmake-3.7.1
 
     ./bootstrap
-    make -j $cpus
+    gmake
     sudo make install
     cd ..
 fi
@@ -151,7 +149,7 @@ fi
 cd rabbitmq-c
 git checkout v0.7.1
 cmake .  -DCMAKE_C_FLAGS=-fPIC -DBUILD_SHARED_LIBS=N  -DCMAKE_INSTALL_PREFIX=/usr
-sudo make install -j $cpus
+sudo make install
 cd ../../
 
 # TCL
@@ -180,7 +178,7 @@ then
    tar xzf tcl8.6.5-src.tar.gz
    cd tcl8.6.5/unix
    ./configure
-   sudo make install -j $cpus
+   sudo make install
    cd ../../..
 fi
 
@@ -198,7 +196,7 @@ git checkout v2.9
 mkdir build
 cd build
 cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DJANSSON_INSTALL_LIB_DIR=$install_libdir
-make -j $cpus
+make
 sudo make install
 cd ../../
 
@@ -218,7 +216,7 @@ pushd $avro_dir/build
 # Make sure the library isn't linked against snappy
 sed -i 's/find_package(Snappy)//' ../lang/c/CMakeLists.txt
 cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fPIC -DCMAKE_CXX_FLAGS=-fPIC
-make -j $cpus
+make
 sudo make install
 popd