From 08f480baa92233e05cac9046faa29ab54dcbfb12 Mon Sep 17 00:00:00 2001
From: Bensuperpc <bensuperpc@gmail.com>
Date: Wed, 12 May 2021 11:18:20 +0200
Subject: [PATCH] Add OpenCV and boost lib

---
 .github/workflows/main.yml          |  1 +
 common.lib                          |  1 +
 linux-armv5/Dockerfile.in           |  2 ++
 linux-armv6/Dockerfile.in           |  2 ++
 linux-armv7/Dockerfile.in           |  2 ++
 linux-armv7a/Dockerfile.in          |  2 ++
 linux-armv8-rpi4/Dockerfile.in      |  2 ++
 linux-armv8/Dockerfile.in           |  2 ++
 linux-mips/Dockerfile.in            |  2 ++
 linux-mips64/Dockerfile.in          |  2 ++
 linux-mips64/Dockerfile.in.with_lib | 39 -----------------------------
 linux-mipsel/Dockerfile.in          |  2 ++
 linux-ppc32/Dockerfile.in           |  2 ++
 linux-ppc64/Dockerfile.in           |  2 ++
 linux-ppc64le/Dockerfile.in         |  2 ++
 linux-s390x/Dockerfile.in           |  2 ++
 linux-x64/Dockerfile.in             |  2 ++
 linux-x86/Dockerfile.in             |  2 ++
 18 files changed, 32 insertions(+), 39 deletions(-)
 delete mode 100644 linux-mips64/Dockerfile.in.with_lib

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 92e893f..a18e3d0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -5,6 +5,7 @@ on:
     branches:
     - 'master'
     - 'dev'
+    - 'update_libs'
     paths-ignore:
       - '**/README.md'
       - '**/README.rst'
diff --git a/common.lib b/common.lib
index ad6ef30..0bda940 100644
--- a/common.lib
+++ b/common.lib
@@ -23,6 +23,7 @@ RUN cd /tmp/ && git clone https://github.com/opencv/opencv.git && git clone http
     -D BUILD_DOCS=ON \
     -D BUILD_PERF_TESTS=OFF \
     -D BUILD_TESTS=ON \
+    -D BUILD_SHARED_LIBS=OFF \
     -D BUILD_NEW_PYTHON_SUPPORT=OFF \
     -D BUILD_opencv_python3=OFF \
     -D HAVE_opencv_python3=OFF \
diff --git a/linux-armv5/Dockerfile.in b/linux-armv5/Dockerfile.in
index e146905..2b89527 100644
--- a/linux-armv5/Dockerfile.in
+++ b/linux-armv5/Dockerfile.in
@@ -40,4 +40,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-armv6/Dockerfile.in b/linux-armv6/Dockerfile.in
index 32c0523..b973dd4 100644
--- a/linux-armv6/Dockerfile.in
+++ b/linux-armv6/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-armv7/Dockerfile.in b/linux-armv7/Dockerfile.in
index 2e6103e..145d8b6 100644
--- a/linux-armv7/Dockerfile.in
+++ b/linux-armv7/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-armv7a/Dockerfile.in b/linux-armv7a/Dockerfile.in
index c1d38ab..093b53b 100644
--- a/linux-armv7a/Dockerfile.in
+++ b/linux-armv7a/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-armv8-rpi4/Dockerfile.in b/linux-armv8-rpi4/Dockerfile.in
index 171e556..facaf23 100644
--- a/linux-armv8-rpi4/Dockerfile.in
+++ b/linux-armv8-rpi4/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm64
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-armv8/Dockerfile.in b/linux-armv8/Dockerfile.in
index bce7b35..e215bf1 100644
--- a/linux-armv8/Dockerfile.in
+++ b/linux-armv8/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH arm64
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-mips/Dockerfile.in b/linux-mips/Dockerfile.in
index df06190..ff59445 100644
--- a/linux-mips/Dockerfile.in
+++ b/linux-mips/Dockerfile.in
@@ -34,4 +34,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH mips
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-mips64/Dockerfile.in b/linux-mips64/Dockerfile.in
index 2e52adf..0c34c31 100644
--- a/linux-mips64/Dockerfile.in
+++ b/linux-mips64/Dockerfile.in
@@ -34,4 +34,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH mips
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-mips64/Dockerfile.in.with_lib b/linux-mips64/Dockerfile.in.with_lib
deleted file mode 100644
index 0c34c31..0000000
--- a/linux-mips64/Dockerfile.in.with_lib
+++ /dev/null
@@ -1,39 +0,0 @@
-FROM dockcross/base:latest
-
-# This is for 64-bit Little-Endian MIPS devices with hard floating point enabled
-
-#include "common.crosstool"
-
-# The cross-compiling emulator
-RUN apt-get update \
-&& apt-get install -y \
-  qemu-user \
-  qemu-user-static \
-&& apt-get clean --yes
-
-# The CROSS_TRIPLE is a configured alias of the "mips64el-unknown-linux-gnu" target.
-ENV CROSS_TRIPLE mips64el-unknown-linux-gnu
-
-ENV CROSS_ROOT ${XCC_PREFIX}/${CROSS_TRIPLE}
-ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
-    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
-    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
-    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
-
-ENV QEMU_LD_PREFIX "${CROSS_ROOT}/${CROSS_TRIPLE}/sysroot"
-ENV QEMU_SET_ENV "LD_LIBRARY_PATH=${CROSS_ROOT}/lib:${QEMU_LD_PREFIX}"
-
-COPY Toolchain.cmake ${CROSS_ROOT}/
-ENV CMAKE_TOOLCHAIN_FILE ${CROSS_ROOT}/Toolchain.cmake
-
-# Linux kernel cross compilation variables
-ENV PATH ${PATH}:${CROSS_ROOT}/bin
-ENV CROSS_COMPILE ${CROSS_TRIPLE}-
-ENV ARCH mips
-
-#include "common.lib"
-
-#include "common.label-and-env"
diff --git a/linux-mipsel/Dockerfile.in b/linux-mipsel/Dockerfile.in
index d94a480..26e1e7d 100644
--- a/linux-mipsel/Dockerfile.in
+++ b/linux-mipsel/Dockerfile.in
@@ -34,4 +34,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH mips
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-ppc32/Dockerfile.in b/linux-ppc32/Dockerfile.in
index 4d356f6..39e60ba 100644
--- a/linux-ppc32/Dockerfile.in
+++ b/linux-ppc32/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH powerpc
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-ppc64/Dockerfile.in b/linux-ppc64/Dockerfile.in
index bc79257..3cc704a 100644
--- a/linux-ppc64/Dockerfile.in
+++ b/linux-ppc64/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH powerpc64
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-ppc64le/Dockerfile.in b/linux-ppc64le/Dockerfile.in
index 2528332..8d70317 100644
--- a/linux-ppc64le/Dockerfile.in
+++ b/linux-ppc64le/Dockerfile.in
@@ -36,4 +36,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH powerpc64
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-s390x/Dockerfile.in b/linux-s390x/Dockerfile.in
index b925174..2bd19e0 100644
--- a/linux-s390x/Dockerfile.in
+++ b/linux-s390x/Dockerfile.in
@@ -34,4 +34,6 @@ ENV PATH ${PATH}:${CROSS_ROOT}/bin
 ENV CROSS_COMPILE ${CROSS_TRIPLE}-
 ENV ARCH s390
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-x64/Dockerfile.in b/linux-x64/Dockerfile.in
index a966bdb..5f195e1 100644
--- a/linux-x64/Dockerfile.in
+++ b/linux-x64/Dockerfile.in
@@ -22,4 +22,6 @@ COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop
 COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
 ENV CMAKE_TOOLCHAIN_FILE /usr/lib/${CROSS_TRIPLE}/Toolchain.cmake
 
+#include "common.lib"
+
 #include "common.label-and-env"
diff --git a/linux-x86/Dockerfile.in b/linux-x86/Dockerfile.in
index 96fbdcc..d9d765d 100644
--- a/linux-x86/Dockerfile.in
+++ b/linux-x86/Dockerfile.in
@@ -43,4 +43,6 @@ ENV ARCH x86
 COPY linux32-entrypoint.sh /dockcross/
 ENTRYPOINT ["/dockcross/linux32-entrypoint.sh"]
 
+#include "common.lib"
+
 #include "common.label-and-env"