VNC-127 Improve TBB build script

builder/scripts/build-tbb

@@ -3,23 +3,61 @@
 set -euo pipefail
 
 build_and_install() {
-  cmake -B build -DCMAKE_INSTALL_PREFIX=/usr/local \
+    if [ $older_release -eq 1 ]; then
-    -DTBB_TEST=OFF -DBUILD_SHARED_LIBS=OFF -GNinja .
+        make extra_inc=big_iron.inc work_dir="$PWD"/ tbb_root="$PWD"
-  ninja -C build install
+
+        if [ -d /usr/lib/x86_64-linux-gnu ]; then
+            LIBS=lib/x86_64-linux-gnu
+        elif [ -d /usr/lib/aarch64-linux-gnu ]; then
+            LIBS=lib/aarch64-linux-gnu
+        elif [ -d /usr/lib/arm-linux-gnueabihf ]; then
+            LIBS=lib/arm-linux-gnu
+        fi
+
+        PC_FILE=/usr/${LIBS}/pkgconfig/tbb.pc
+        echo "prefix=/usr" > "${PC_FILE}"
+        echo "exec_prefix=\${prefix}" >> "${PC_FILE}"
+        echo "libdir=\${exec_prefix}/lib/${LIBS}" >> "${PC_FILE}"
+        echo "includedir=\${prefix}/include" >> "${PC_FILE}"
+        echo "Name: Threading Building Blocks" >> "${PC_FILE}"
+        echo "Description: Intel's parallelism library for C++" >> "${PC_FILE}"
+        echo "URL: http://www.threadingbuildingblocks.org/" >> "${PC_FILE}"
+        echo "Version: v2020.3.3" >> "${PC_FILE}"
+        echo "Libs: -ltbb -latomic" >> "${PC_FILE}"
+        echo "Cflags: -I\${includedir}" >> "${PC_FILE}"
+
+        cp _release/*.a /usr/"${LIBS}"/
+        cp -r include/* /usr/include/
+    else
+        cmake -B build -DCMAKE_INSTALL_PREFIX=/usr/local \
+            -DTBB_TEST=OFF -DBUILD_SHARED_LIBS=OFF -GNinja .
+        ninja -C build install
+    fi
 }
 
 prepare_source() {
-  DIR=tbb
+    DIR=tbb
-  cd /tmp
+    cd /tmp
-  TBB_RELEASE=$(curl -sL "https://api.github.com/repos/uxlfoundation/oneTBB/releases/latest" \
+    [ -d ./${DIR} ] && rm -rf ./${DIR}
-    | grep '"tag_name":' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
+    mkdir ${DIR}
 
-  [ -d ./${DIR} ] && rm -rf ./${DIR}
+    if [ $older_release -eq 1 ]; then
-  mkdir ${DIR}
+        TBB_RELEASE="v2020.3.3"
-  curl -Ls "https://github.com/uxlfoundation/oneTBB/archive/${TBB_RELEASE}.tar.gz" | \
+    else
-  tar xzvf - -C ${DIR}/ --strip-components=1
+        TBB_RELEASE=$(curl -sL "https://api.github.com/repos/uxlfoundation/oneTBB/releases/latest" \
-  cd ${DIR}
+        | grep '"tag_name":' | sed -E 's/.*"tag_name": "([^"]+)".*/\1/')
+    fi
+
+    curl -Ls "https://github.com/uxlfoundation/oneTBB/archive/${TBB_RELEASE}.tar.gz" | \
+
+    tar xzvf - -C ${DIR}/ --strip-components=1
+    cd ${DIR}
 }
 
+older_release=0
+if grep -q 'Ubuntu 20.04\|Debian GNU/Linux 11' /etc/os-release 2>/dev/null; then
+    older_release=1
+fi
+
 prepare_source
 build_and_install

common/rfb/CMakeLists.txt

@@ -140,7 +140,6 @@ else ()
     set(RFB_LIBRARIES ${RFB_LIBRARIES} ${TBB_LIBRARIES})
 endif ()
 
-message(STATUS ${RFB_LIBRARIES})
 add_library(rfb STATIC ${RFB_SOURCES})
 
 target_include_directories(rfb PRIVATE