Merge pull request #1 from arduino/bump-deps

Bump deps

Author: umbynos

Dockerfile

@@ -23,18 +23,20 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone &
         pkg-config \
         tar \
         unzip \
+        llvm \
     && rm -rf /var/lib/apt/lists/*
 # Install toolchains in /opt
 RUN curl 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
 
-RUN cd /opt/osxcross \
-    git pull \
-    # use a specific version of osxcross (it does not have tags)
-    git checkout da2c3d4ff604458a931b08b3af800c5a454136de \
-    UNATTENDED=1 SDK_VERSION=10.15 ./build.sh
+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 && \
+    ENABLE_COMPILER_RT_INSTALL=1 SDK_VERSION=10.15 ./build_compiler_rt.sh
 # Set toolchains paths
 # arm-linux-gnueabihf-gcc -> linux_arm
 # aarch64-linux-gnu-gcc -> linux_arm64
@@ -59,6 +61,7 @@ RUN CROSS_COMPILE=x86_64-ubuntu16.04-linux-gnu /opt/lib/build_libs.sh && \
 FROM ubuntu:latest
 # 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
 ENV TZ=Europe/Rome
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone && \
     apt-get update && \

README.md

@@ -1,9 +1,9 @@
 # Docker crossbuild
 
-This docker container has been created to allow us to easily crosscompile the c++ tools starting from this repo. The idea comes from [multiarch/crossbuild](https://github.com/multiarch/crossbuild), but this container unfortunately is outdated, the apt sources are no longer available.
+This docker container has been created to allow us to easily crosscompile our c++ tools. The idea comes from [multiarch/crossbuild](https://github.com/multiarch/crossbuild), but that container unfortunately is outdated and the apt sources are no longer available.
 
 ## Starting Image
-The starting image is [ubuntu:latest](https://hub.docker.com/_/ubuntu) (The ubuntu:latest tag points to the "latest LTS", since that's the version recommended for general use.) at the time of writing latest points to Ubuntu 20.04 focal.
+The starting image is [ubuntu:latest](https://hub.docker.com/_/ubuntu) (The ubuntu:latest tag points to the "latest LTS", since that's the version recommended for general use.) at the time of writing latest points to Ubuntu 22.04 jammy.
 
 The starting image is only marginally important, since internally we use manually installed toolchains.
 
@@ -18,21 +18,20 @@ Inside that archive there are:
 
 Regarding the two ubuntu toolchains: in the beginning we tried to use the ones shipped with 12.04 but they caused some build errors because they were too old, so we upgraded to 16.04 ones. They are created using [crosstool-ng](https://github.com/crosstool-ng/crosstool-ng).
 
-
 Apparently, osxcross does not have tags or version so we checkout a specific commit in order to have a pinned environment.
 
 The last toolchain required to crosscompile for windows is `mingw-w64` and it's installed through `apt` along with other useful packages.
 
-Once the toolchains are installed in `/opt` we add the binaries to the `PATH` env variable, to easily call them in the CI.
+Once the toolchains are installed in `/opt` we add the binaries to the `PATH` env variable, to easily use them in the CI.
 
 ## Copying and Building Libraries
-As explained in the other [`README.md`](deps/README.md) there are some libraries that needs to be compiled. This is achieved by copying `deps/` directory inside `/opt/lib/` in the container and then by using [`build_libs.sh`](deps/build_libs.sh) script [here](Dockerfile#L47-L55)
+As explained in the other [`README.md`](deps/README.md) there are some libraries that needs to be compiled, in order to create static binaries. This is achieved by copying `deps/` directory inside `/opt/lib/` in the container and then by using [`build_libs.sh`](deps/build_libs.sh) script [here](Dockerfile#L53-L59)
 
 ## Multi-stage build
-To reduce the overall dimesion of the docker image we used the  [multi-stage build](https://learnk8s.io/blog/smaller-docker-images). 
+To reduce the overall dimension of the docker image we used the  [multi-stage build](https://learnk8s.io/blog/smaller-docker-images). But the image still 8GB.
 
 ## How to build and use the container
 Usefull commands you can use:
-- `docker build -t ghcr.io/arduino/crossbuild:<version> docker/` to build the container
+- `docker build -t ghcr.io/arduino/crossbuild:<version> .` to build the container
 - `docker push ghcr.io/arduino/crossbuild:<version>` to push the image to [github remote registry](https://docs.github.com/en/packages/guides/container-guides-for-github-packages)
-- `docker run -it --name crossbuild -v $PWD:/workdir ghcr.io/arduino/crossbuild:<version>` to get a shell inside the container and use the toolchains available inside (like the CI does).
+- `docker run -it --name crossbuild -v $PWD:/workdir ghcr.io/arduino/crossbuild:<version>` to get a shell inside the container and use the toolchains available inside (just like the CI does).

deps/README.md

@@ -1,47 +1,18 @@
 # Dependencies
-The `deps/` folder contains the dependencies used to build and link statically `picotool` and `elf2uf2`: the libraries `libusb` and `libudev`.
-The `deps/` folder contains also a bash script used by the docker container to successfully build them with different toolchains and with different targets.
-This way they are already compiled and usable by the CI during the building/linking phase!
+The `deps/` folder contains the library dependencies used to build and link statically tools, like `picotool` and `elf2uf2` (the libraries `libusb` and `libudev`...).
+The `deps/` folder contains also a bash script used by the [Dockerfile](../Dockerfile) to successfully build them with different toolchains and with different targets.
+This way they are ready when used by the CI during the building/linking phase!
 
-They come respectively from [here](https://github.com/arduino/OpenOCD-build-script/tree/static/libusb-1.0.20)
-and from [here](https://github.com/gentoo/eudev)
+They come from:
+- https://github.com/gentoo/eudev
+- https://github.com/libusb/hidapi
+- https://fossies.org/linux/misc/old/libelf-0.8.13.tar.gz/
+- https://www.intra2net.com/en/developer/libftdi/index.php
+- https://github.com/libusb/libusb
+- https://github.com/libusb/libusb-compat-0.1
+- https://ftp.gnu.org/gnu/ncurses/
+- https://ftp.gnu.org/gnu/readline/
 
 ## `build_libs.sh`
-`build_libs.sh` is used by the [Dockerfile](../Dockerfile#L49-L55):
+`build_libs.sh` is used by the [Dockerfile](../Dockerfile#L53-L59):
 Basically during the docker build phase the libraries are compiled with every toolchain available in the Docker container. Other libraries can be added, the [`build_libs.sh`](build_libs.sh) script needs to be adapted, but the Dockerfile should be ok.
-
-## libusbudev
-libusbudev is the result of merging the two `.a` files with a command line tool called `ar`. This is done to ease the linking phase done by the [CI](.github/workflows/release.yml#L87) passing a single static library. See `LIBUSBUDEV` env variable [here](../../.github/workflows/release.yml#L67) and [here](../../.github/workflows/release.yml#L71).
-For macos is not required to merge the two libraries because libudev is not a requirement, so macos uses `libusb.a` only: thus the distinction between the two platforms. Infact libusb for mac is the last one built in the [Dockerfile](../Dockerfile#L55).
-
-`libusbudev.a` is created by the `build_libs.sh` the directory structure created is the following:
-
-```
-/opt/lib/
-|-- aarch64-linux-gnu
-|   |-- libudev
-|   |-- libusb
-|   `-- libusbudev.a
-|-- arm-linux-gnueabihf
-|   |-- libudev
-|   |-- libusb
-|   `-- libusbudev.a
-|-- build_libs.sh
-|-- eudev-3.2.10
-|-- i686-ubuntu16.04-linux-gnu
-|   |-- libudev
-|   |-- libusb
-|   `-- libusbudev.a
-|-- i686-w64-mingw32
-|   |-- libudev
-|   |-- libusb
-|   `-- libusbudev.a
-|-- libusb-1.0.20
-`-- x86_64-ubuntu16.04-linux-gnu
-    |-- libudev
-    |-- libusb
-    `-- libusbudev.a
-```
-
-The original `libusb.a` is available in `/opt/lib/libusb-1.0.20/libusb/.libs/libusb-1.0.a`
-and `libudev.a` is available in `/opt/lib/eudev-3.2.10/src/libudev/.libs/libudev.a`

deps/build_libs.sh

@@ -12,12 +12,12 @@ export CXX=$CROSS_COMPILER++
 CROSS_COMPILER=$CC
 CROSS_COMPILER_CXX=$CXX
 fi
-cd /opt/lib/libusb-1.0.20
+cd /opt/lib/libusb-1.0.26
 export LIBUSB_DIR=`pwd`
-./configure --prefix=${PREFIX} --disable-udev --enable-static --disable-shared --host=${CROSS_COMPILE}
+./configure --prefix=${PREFIX} --with-pic --disable-udev --enable-static --disable-shared --host=${CROSS_COMPILE}
 make distclean
-./configure --prefix=${PREFIX} --disable-udev --enable-static --disable-shared --host=${CROSS_COMPILE}
-make
+./configure --prefix=${PREFIX} --with-pic --disable-udev --enable-static --disable-shared --host=${CROSS_COMPILE}
+make -j$(nproc)
 make install
 
 export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
@@ -36,12 +36,12 @@ else
     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.5
+  cd /opt/lib/libusb-compat-0.1.7
   export LIBUSB0_DIR=`pwd`
   PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
   make distclean
   PKG_CONFIG_PATH="$PREFIX/lib/pkgconfig" ./configure --prefix=${PREFIX} --enable-static --disable-shared --host=${CROSS_COMPILE}
-  make
+  make -j$(nproc)
   make install
 fi
 
@@ -59,15 +59,15 @@ if [[ $CROSS_COMPILE == "x86_64-apple-darwin13" ]]; then
 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
+make -j$(nproc)
 make install
 
 cd /opt/lib/libelf-0.8.13
 export LIBELF_DIR=`pwd`
 ./configure --disable-shared --host=$CROSS_COMPILE --prefix=${PREFIX}
 make distclean
 ./configure --disable-shared --host=$CROSS_COMPILE --prefix=${PREFIX}
-make
+make -j$(nproc)
 make install
 
 echo "*****************"
@@ -82,15 +82,15 @@ export NCURSES_DIR=`pwd`
 ./configure $EXTRAFLAGS --disable-shared --without-debug --without-ada --with-termlib --enable-termcap --without-manpages --without-progs --without-tests --host=$CROSS_COMPILE --prefix=${PREFIX}
 make distclean
 ./configure $EXTRAFLAGS --disable-shared --without-debug --without-ada --with-termlib --enable-termcap --without-manpages --without-progs --without-tests --host=$CROSS_COMPILE --prefix=${PREFIX}
-make
+make -j$(nproc)
 make install.libs
 
 cd /opt/lib/readline-8.0
 export READLINE_DIR=`pwd`
 ./configure --prefix=$PREFIX --disable-shared --host=$CROSS_COMPILE
 make distclean
 ./configure --prefix=$PREFIX --disable-shared --host=$CROSS_COMPILE
-make
+make -j$(nproc)
 make install-static
 
 if [[ $CROSS_COMPILE != "i686-w64-mingw32" && $CROSS_COMPILE != "x86_64-apple-darwin13" ]] ; then
@@ -100,16 +100,16 @@ cd /opt/lib/eudev-3.2.10
 make distclean
 ./autogen.sh
 ./configure --enable-static --disable-gudev --disable-introspection --disable-shared --disable-blkid --disable-kmod --disable-manpages --prefix=$PREFIX --host=${CROSS_COMPILE}
-make
+make -j$(nproc)
 make install
 fi
 
-cd /opt/lib/hidapi
+cd /opt/lib/hidapi-0.12.0
 export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
 ./bootstrap
 ./configure --prefix=$PREFIX --enable-static --disable-shared --host=$CROSS_COMPILE
 make distclean
 ./bootstrap
 ./configure --prefix=$PREFIX --enable-static --disable-shared --host=$CROSS_COMPILE
-make
+make -j$(nproc)
 make install

deps/hidapi-0.12.0/.appveyor.yml

@@ -0,0 +1,29 @@
+os: Visual Studio 2015
+
+environment:
+  matrix:
+  - BUILD_ENV: msbuild
+    arch: x64
+  - BUILD_ENV: msbuild
+    arch: Win32
+  - BUILD_ENV: cygwin
+
+for:
+  -
+    matrix:
+      only:
+        - BUILD_ENV: msbuild
+
+    build_script:
+      - cmd: msbuild .\windows\hidapi.sln /p:Configuration=Release /p:Platform=%arch% /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+
+  -
+    matrix:
+      only:
+        - BUILD_ENV: cygwin
+
+    install:
+      - cmd: C:\cygwin64\setup-x86_64.exe --quiet-mode --no-shortcuts --upgrade-also --packages autoconf,automake
+
+    build_script:
+      - cmd: C:\cygwin64\bin\bash -exlc "cd $APPVEYOR_BUILD_FOLDER; ./bootstrap; ./configure; make"