Add boost linux clang and refirmat bash

2019-12-15 17:46:11 -06:00
parent 2ed09e7ebd
commit 93b65e3503
7 changed files with 251 additions and 254 deletions
--- a/boost/build.sh
+++ b/boost/build.sh
@@ -6,7 +6,7 @@ case "${unameOut}" in
 Darwin*) machineArch=MacOS ;;
 CYGWIN*) machineArch=Windows ;;
 MINGW*) machineArch=Windows ;;
-    *)          machineArch="UNKNOWN:${unameOut}"
+*) machineArch="UNKNOWN:${unameOut}" ;;
 esac
 echo ${machineArch}

@@ -40,14 +40,15 @@ mkdir -p $libSrcPath
 tar zxvpf $libFilePath -C $buildPath

 if [ "${machineArch}" = "Linux" ]; then
-  (cd $libSrcPath && \
-  ./bootstrap.sh \
-  --prefix=$libInstallPath && \
+  (cd $libSrcPath &&
+    ./bootstrap.sh --prefix=$libInstallPath &&
    ./b2 \
      --build-dir=$libBuildPath \
      --prefix=$libInstallPath \
      --layout=versioned \
      -j 4 \
+      toolset=gcc \
+      toolset=clang \
      variant=release,debug \
      link=shared \
      threading=multi \
@@ -55,10 +56,9 @@ if [ "${machineArch}" = "Linux" ]; then
      address-model=64 \
      install)
 elif [ "${machineArch}" = "MacOS" ]; then
-  (cd $libSrcPath && \
-  ./bootstrap.sh \
-  --prefix=$libInstallPath \
-  --with-toolset=clang && \
+  (cd $libSrcPath &&
+    ./bootstrap.sh --prefix=$libInstallPath \
+      --with-toolset=clang &&
    ./b2 \
      --build-dir=$libBuildPath \
      --prefix=$libInstallPath \
@@ -69,14 +69,14 @@ elif [ "${machineArch}" = "MacOS" ]; then
      threading=multi \
      runtime-link=shared \
      address-model=64 \
-  toolset=clang \
      install)
 elif [ "${machineArch}" = "Windows" ]; then
-  (cd $libSrcPath && \
-  ./bootstrap.bat --prefix=$libInstallPath && \
+  (cd $libSrcPath &&
+    ./bootstrap.bat --prefix=$libInstallPath &&
    ./b2 \
      --build-dir=$libBuildPath \
      --prefix=$libInstallPath \
+      --layout=versioned \
      -j 4 \
      variant=release,debug \
      link=shared \
--- a/google/benchmark/build.sh
+++ b/google/benchmark/build.sh
@@ -6,7 +6,7 @@ case "${unameOut}" in
 Darwin*) machineArch=MacOS ;;
 CYGWIN*) machineArch=Windows ;;
 MINGW*) machineArch=Windows ;;
-    *)          machineArch="UNKNOWN:${unameOut}"
+*) machineArch="UNKNOWN:${unameOut}" ;;
 esac
 echo ${machineArch}

@@ -40,22 +40,22 @@ mkdir -p $libSrcPath
 tar zxvpf $libFilePath -C $buildPath

 if [ "${machineArch}" = "Linux" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath/release \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Debug \
      -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath/debug \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
 elif [ "${machineArch}" = "MacOS" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON \
@@ -63,9 +63,9 @@ elif [ "${machineArch}" = "MacOS" ]; then
      -DLLVMAR_EXECUTABLE:PATH=/usr/bin/ar \
      -DLLVMNM_EXECUTABLE:PATH=/usr/bin/nm \
      -DLLVMRANLIB_EXECUTABLE:PATH=/usr/bin/ranlib \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Debug \
      -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON \
@@ -73,29 +73,29 @@ elif [ "${machineArch}" = "MacOS" ]; then
      -DLLVMAR_EXECUTABLE:PATH=/usr/bin/ar \
      -DLLVMNM_EXECUTABLE:PATH=/usr/bin/nm \
      -DLLVMRANLIB_EXECUTABLE:PATH=/usr/bin/ranlib \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
 elif [ "${machineArch}" = "Windows" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath/release \
      -G "Visual Studio 16 2019" \
      -A x64 \
-  $libSrcPath && \
+      $libSrcPath &&
    cmake \
      --build . \
      --config Release \
      --target INSTALL)
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Debug \
      -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath/debug \
      -G "Visual Studio 16 2019" \
      -A x64 \
-  $libSrcPath && \
+      $libSrcPath &&
    cmake \
      --build . \
      --config Debug \
--- a/google/log/build.sh
+++ b/google/log/build.sh
@@ -6,7 +6,7 @@ case "${unameOut}" in
 Darwin*) machineArch=MacOS ;;
 CYGWIN*) machineArch=Windows ;;
 MINGW*) machineArch=Windows ;;
-    *)          machineArch="UNKNOWN:${unameOut}"
+*) machineArch="UNKNOWN:${unameOut}" ;;
 esac
 echo ${machineArch}

@@ -40,48 +40,48 @@ mkdir -p $libSrcPath
 tar zxvpf $libFilePath -C $buildPath

 if [ "${machineArch}" = "Linux" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Debug \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
 elif [ "${machineArch}" = "MacOS" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Debug \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
 elif [ "${machineArch}" = "Windows" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
      -G "Visual Studio 16 2019" \
      -A x64 \
-  $libSrcPath && \
+      $libSrcPath &&
    cmake \
      --build . \
      --config Release \
-  --target INSTALL && \
+      --target INSTALL &&
    cmake \
      --build . \
      --config Debug \
--- a/google/test/build.sh
+++ b/google/test/build.sh
@@ -6,7 +6,7 @@ case "${unameOut}" in
 Darwin*) machineArch=MacOS ;;
 CYGWIN*) machineArch=Windows ;;
 MINGW*) machineArch=Windows ;;
-    *)          machineArch="UNKNOWN:${unameOut}"
+*) machineArch="UNKNOWN:${unameOut}" ;;
 esac
 echo ${machineArch}

@@ -40,48 +40,48 @@ mkdir -p $libSrcPath
 tar zxvpf $libFilePath -C $buildPath

 if [ "${machineArch}" = "Linux" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Debug \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
 elif [ "${machineArch}" = "MacOS" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Debug \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
-  $libSrcPath && \
+      $libSrcPath &&
    make install -j)
 elif [ "${machineArch}" = "Windows" ]; then
-  ( cd $libBuildPath && \
+  (cd $libBuildPath &&
    cmake \
      -DCMAKE_BUILD_TYPE=Release \
      -DBUILD_SHARED_LIBS:BOOL=TRUE \
      -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath \
      -G "Visual Studio 16 2019" \
      -A x64 \
-  $libSrcPath && \
+      $libSrcPath &&
    cmake \
      --build . \
      --config Release \
-  --target INSTALL && \
+      --target INSTALL &&
    cmake \
      --build . \
      --config Debug \
--- a/mpi/mpich/build.sh
+++ b/mpi/mpich/build.sh
@@ -65,7 +65,7 @@ echo
 echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH"

 # run the configure command with all build options
-( cd $libBuildPath && \
+(cd $libBuildPath &&
  $libSrcPath/configure \
    --prefix=$libInstallPath \
    --disable-fc \
@@ -79,9 +79,8 @@ CXX=g++ \
    2>&1 | tee config.out.txt)

 # clean, build, and install
-( cd $libBuildPath && \
+(cd $libBuildPath &&
  make clean)

-( cd $libBuildPath && \
+(cd $libBuildPath &&
  make install -j 2>&1 | tee build.out.txt)
-
--- a/mpi/openmpi/build.sh
+++ b/mpi/openmpi/build.sh
@@ -78,11 +78,10 @@ echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH"
 #FCFLAGS=$BFFLAGS

 # run the configure command with all build options
-( cd $libBuildPath && \
+(cd $libBuildPath &&
  $libSrcPath/configure \
    --prefix=$libInstallPath \
    --disable-vt \
--disable-mpi-fortran \
    --disable-mpi-cxx \
    --disable-static \
    --disable-wrapper-rpath \
@@ -93,9 +92,8 @@ CFLAGS=$BCFLAGS \
    2>&1 | tee config.out.txt)

 # clean, build, and install
-( cd $libBuildPath && \
+(cd $libBuildPath &&
  make clean)

-( cd $libBuildPath && \
+(cd $libBuildPath &&
  make install -j 2>&1 | tee build.out.txt)
-
--- a/swig/build.sh
+++ b/swig/build.sh
@@ -26,7 +26,7 @@ mkdir -p $libInstallPath
 mkdir -p $libSrcPath

 tar zxvpf $libFilePath -C $buildPath
-( cd $libSrcPath && \
-./configure --prefix=$libInstallPath && \
-make -j && \
+(cd $libSrcPath &&
+  ./configure --prefix=$libInstallPath &&
+  make -j &&
  make install)