Updated deps and compilers

Author: cmaglie

Dockerfile

@@ -1,12 +1,12 @@
-FROM ubuntu:latest as build
+FROM ubuntu:22.04 as build
 
 ENV TZ=Europe/Rome
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
     apt-get update && \
     apt-get install -y \
         build-essential \
         # Intall clang compiler used by macos
-        clang \
+        clang-13 \
         cmake \
         curl \
         dh-autoreconf \
@@ -24,9 +24,12 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
         tar \
         unzip \
         llvm \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && ln -s /usr/bin/clang-13 /usr/bin/clang \
+    && ln -s /usr/bin/clang++-13 /usr/bin/clang++
+
 # Install toolchains in /opt
-RUN curl downloads.arduino.cc/tools/internal/toolchains.tar.gz | tar -xz "opt"
+RUN curl -L downloads.arduino.cc/tools/internal/toolchains.tar.gz | tar -xz "opt"
     # install proper arm toolchains (already present in the toolchains.tar.gz archive)
     # curl -L 'https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf.tar.xz' | tar -xJC /opt && \
     # curl -L 'https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/gcc-arm-8.3-2019.03-x86_64-aarch64-linux-gnu.tar.xz' | tar -xJC /opt
@@ -35,7 +38,8 @@ RUN cd /opt/osxcross && \
     git pull && \
     # use a specific version of osxcross (it does not have tags), this commit has the automatic install of compiler_rt libraries
     git checkout b875d7c1360c8ff2077463d7a5a12e1cff1cc683 && \
-    UNATTENDED=1 SDK_VERSION=10.15 ./build.sh && \
+    UNATTENDED=1 SDK_VERSION=10.15 ./build.sh
+RUN cd /opt/osxcross && \
     ENABLE_COMPILER_RT_INSTALL=1 SDK_VERSION=10.15 ./build_compiler_rt.sh
 # Set toolchains paths
 # arm-linux-gnueabihf-gcc -> linux_arm
@@ -50,25 +54,25 @@ WORKDIR /workdir
 # Handle libusb and libudev compilation and merging
 COPY deps/ /opt/lib/
 # compiler name is arm-linux-gnueabihf-gcc '-gcc' is added by ./configure
-RUN CROSS_COMPILE=x86_64-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh && \
-    CROSS_COMPILE=arm-linux-gnueabihf /opt/lib/build_libs.sh && \
-    CROSS_COMPILE=aarch64-linux-gnu /opt/lib/build_libs.sh && \
-    CROSS_COMPILE=i686-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh && \
-    CROSS_COMPILE=i686-w64-mingw32 /opt/lib/build_libs.sh && \
-    # CROSS_COMPILER is used to override the compiler 
-    CROSS_COMPILER=o64-clang CROSS_COMPILE=x86_64-apple-darwin13 AR=/opt/osxcross/target/bin/x86_64-apple-darwin13-ar RANLIB=/opt/osxcross/target/bin/x86_64-apple-darwin13-ranlib /opt/lib/build_libs.sh
+RUN CROSS_COMPILE=x86_64-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh
+RUN CROSS_COMPILE=arm-linux-gnueabihf /opt/lib/build_libs.sh
+RUN CROSS_COMPILE=aarch64-linux-gnu /opt/lib/build_libs.sh
+RUN CROSS_COMPILE=i686-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh
+RUN CROSS_COMPILE=i686-w64-mingw32 /opt/lib/build_libs.sh
+# CROSS_COMPILER is used to override the compiler 
+RUN CROSS_COMPILER=o64-clang CROSS_COMPILE=x86_64-apple-darwin13 AR=/opt/osxcross/target/bin/x86_64-apple-darwin13-ar RANLIB=/opt/osxcross/target/bin/x86_64-apple-darwin13-ranlib /opt/lib/build_libs.sh
 
-FROM ubuntu:latest
+FROM ubuntu:22.04
 # Copy all the installed toolchains and compiled libs
 COPY --from=build /opt /opt
-COPY --from=build /usr/lib/llvm-10/lib/clang/10.0.0 /usr/lib/llvm-10/lib/clang/10.0.0
+COPY --from=build /usr/lib/llvm-13/lib/clang/13.0.1 /usr/lib/llvm-13/lib/clang/13.0.1
 ENV TZ=Europe/Rome
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
     apt-get update && \
     apt-get install -y \
     build-essential \
         # Intall clang compiler used by macos
-        clang \
+        clang-13 \
         cmake \
         dh-autoreconf \
         git \
@@ -79,7 +83,9 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
         tar \
         bison \
         flex \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* \
+    && ln -s /usr/bin/clang-13 /usr/bin/clang \
+    && ln -s /usr/bin/clang++-13 /usr/bin/clang++
 # Set toolchains paths
 # arm-linux-gnueabihf-gcc -> linux_arm
 # aarch64-linux-gnu-gcc -> linux_arm64

deps/build_libs.sh

@@ -15,7 +15,7 @@ else
   CROSS_COMPILER=$CC
   CROSS_COMPILER_CXX=$CXX
 fi
-cd /opt/lib/libusb-1.0.26
+cd /opt/lib/libusb-1.0.28
 LIBUSB_DIR=$(pwd)
 export LIBUSB_DIR
 ./configure --prefix="${PREFIX}" --with-pic --disable-udev --enable-static --disable-shared --host="${CROSS_COMPILE}"
@@ -30,7 +30,7 @@ if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
   export LIBUSB_1_0_CFLAGS=-I${PREFIX}/include/libusb-1.0
   export LIBUSB_1_0_LIBS="-L${PREFIX}/lib -lusb-1.0"
 fi
-cd /opt/lib/libusb-compat-0.1.7
+cd /opt/lib/libusb-compat-0.1.8
 LIBUSB0_DIR=$(pwd)
 export LIBUSB0_DIR
 PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix="${PREFIX}" --enable-static --disable-shared --host="${CROSS_COMPILE}"
@@ -52,9 +52,10 @@ if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
   CMAKE_EXTRA_FLAG="$CMAKE_EXTRA_FLAG -DCMAKE_AR=$AR -DCMAKE_RANLIB=$RANLIB"
 fi
 
-cmake -DCMAKE_C_COMPILER="$CROSS_COMPILER" -DCMAKE_CXX_COMPILER="$CROSS_COMPILER_CXX" -DCMAKE_INSTALL_PREFIX="$PREFIX" "$CMAKE_EXTRA_FLAG" -DLIBUSB_INCLUDE_DIR="$PREFIX/include/libusb-1.0" -DLIBFTDI_LIBRARY_DIRS="$PREFIX/lib" -DLIBUSB_LIBRARIES="usb-1.0" ../
-make -j"$(nproc)"
-make install
+# TODO: did not build anymore (missing -L${PREFIX}/lib to libusb-1.0?)
+#cmake -DCMAKE_C_COMPILER="$CROSS_COMPILER" -DCMAKE_CXX_COMPILER="$CROSS_COMPILER_CXX" -DCMAKE_INSTALL_PREFIX="$PREFIX" "$CMAKE_EXTRA_FLAG" -DLIBUSB_INCLUDE_DIR="$PREFIX/include/libusb-1.0" -DLIBFTDI_LIBRARY_DIRS="$PREFIX/lib" -DLIBUSB_LIBRARIES="usb-1.0" ../
+#make -j"$(nproc)"
+#make install
 
 cd /opt/lib/libelf-0.8.13
 LIBELF_DIR=$(pwd)