Merge remote-tracking branch 'origin/master' into uptate_cmake

Merge pull request #546 from bensuperpc/fix_manylinux2014
Fix manylinux2014x86 and manylinux2014x64, update to devtoolset-10
2025-06-17 16:39:25 +02:00 · 2021-08-07 00:59:45 +02:00 · 2021-08-07 00:58:43 +02:00 · 2021-08-06 22:54:32 +02:00 · 2021-08-06 21:54:37 +02:00 · 2021-08-06 21:53:09 +02:00
9 changed files with 25 additions and 13 deletions
--- a/README.md
+++ b/README.md
@ -149,7 +149,13 @@ Linux armv5 cross compiler toolchain using

 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6)

-Linux ARMv6 cross compiler toolchain for the Raspberry Pi, etc.
+Linux ARMv6 cross compiler toolchain for the Raspberry Pi
+
+### dockcross/linux-armv6-lts
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-armv6-lts/latest) ![MicroBadger Layers (tag)](https://img.shields.io/microbadger/layers/dockcross/linux-armv6-lts/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-armv6-lts)
+
+Linux ARMv6 cross compiler toolchain for the Raspberry Pi (Debian buster...)

 ### dockcross/linux-armv6-musl

--- a/common/common-manylinux.crosstool
+++ b/common/common-manylinux.crosstool
@ -18,7 +18,7 @@ ENV MANYLINUX_DEPS="glibc-devel glibc-devel.i686 libstdc++-devel glib2-devel lib

 ENV PYTHON_COMPILE_DEPS="python-devel zlib-devel bzip2-devel expat-devel ncurses-devel readline-devel tk-devel gdbm-devel libdb-devel libpcap-devel xz-devel openssl-devel keyutils-libs-devel krb5-devel libcom_err-devel libidn-devel curl-devel perl-devel"

-ENV TOOLCHAIN_DEPS="devtoolset-9-binutils devtoolset-9-gcc devtoolset-9-gcc-c++ devtoolset-9-gcc-gfortran"
+ENV TOOLCHAIN_DEPS="devtoolset-10-binutils devtoolset-10-gcc devtoolset-10-gcc-c++ devtoolset-10-gcc-gfortran"

 # Install dependent packages required for `ct-ng`.
 RUN \
@ -62,7 +62,7 @@ RUN \
  rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && \
  # Remove sudo provided by devtoolset since it doesn't work with
  # our sudo wrapper calling gosu.
-  rm -f /opt/rh/devtoolset-9/root/usr/bin/sudo
+  rm -f /opt/rh/devtoolset-10/root/usr/bin/sudo

 # Restore our default workdir (from "dockcross/base").
 WORKDIR /work
--- a/common/common.docker
+++ b/common/common.docker
@ -1,7 +1,7 @@
 WORKDIR /usr/src

 ARG GIT_VERSION=2.32.0
-ARG CMAKE_VERSION=3.20.5
+ARG CMAKE_VERSION=3.21.1

 # Image build scripts
 COPY \
--- a/common/common.manylinux
+++ b/common/common.manylinux
@ -23,6 +23,7 @@ RUN \
  rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \
  rm -f /opt/rh/devtoolset-8/root/usr/bin/sudo && \
  rm -f /opt/rh/devtoolset-9/root/usr/bin/sudo && \
+  rm -f /opt/rh/devtoolset-10/root/usr/bin/sudo && \
  /buildscripts/install-python-packages.sh && \
  rm -rf /buildscripts

--- a/imagefiles/build-and-install-cmake.sh
+++ b/imagefiles/build-and-install-cmake.sh
@ -4,6 +4,9 @@ set -ex

 WRAPPER=""

+CMAKE_URL="https://gitlab.kitware.com/cmake/cmake.git"
+CMAKE_MIRROR_URL="https://github.com/Kitware/CMake.git"
+
 while [ $# -gt 0 ]; do
  case "$1" in
    -32)
@ -29,7 +32,9 @@ fi

 cd /usr/src

-git clone https://gitlab.kitware.com/cmake/cmake.git CMake -b v$CMAKE_VERSION --depth 1
+# If the first link doesn't work, it will use the mirror on github
+git clone "$CMAKE_URL" CMake -b v$CMAKE_VERSION --depth 1 \
+  || git clone "$CMAKE_MIRROR_URL" CMake -b v$CMAKE_VERSION --depth 1

 mkdir /usr/src/CMake-build
 cd /usr/src/CMake-build
--- a/manylinux2014-x64/Dockerfile.in
+++ b/manylinux2014-x64/Dockerfile.in
@ -16,7 +16,7 @@ RUN echo $'#!/bin/bash\n\
 LD_PRELOAD=/usr/lib64/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum

 ENV CROSS_TRIPLE x86_64-linux-gnu
-ENV CROSS_ROOT /opt/rh/devtoolset-9/root/usr/bin
+ENV CROSS_ROOT /opt/rh/devtoolset-10/root/usr/bin
 ENV AS=${CROSS_ROOT}/as \
    AR=${CROSS_ROOT}/ar \
    CC=${CROSS_ROOT}/gcc \
--- a/manylinux2014-x64/Toolchain.cmake
+++ b/manylinux2014-x64/Toolchain.cmake
@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)

 set(MANYLINUX2014 TRUE)

-set(CMAKE_C_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gcc)
-set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-9/root/usr/bin/g++)
+set(CMAKE_C_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gcc)
+set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-10/root/usr/bin/g++)
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
-set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gfortran)
+set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gfortran)
--- a/manylinux2014-x86/Dockerfile.in
+++ b/manylinux2014-x86/Dockerfile.in
@ -16,7 +16,7 @@ RUN echo $'#!/bin/bash\n\
 LD_PRELOAD=/usr/lib/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum

 ENV CROSS_TRIPLE i686-linux-gnu
-ENV CROSS_ROOT /opt/rh/devtoolset-9/root/usr/bin
+ENV CROSS_ROOT /opt/rh/devtoolset-10/root/usr/bin
 ENV AS=${CROSS_ROOT}/as \
    AR=${CROSS_ROOT}/ar \
    CC=${CROSS_ROOT}/gcc \
--- a/manylinux2014-x86/Toolchain.cmake
+++ b/manylinux2014-x86/Toolchain.cmake
@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR i686)

 set(MANYLINUX2014 TRUE)

-set(CMAKE_C_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gcc)
-set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-9/root/usr/bin/g++)
+set(CMAKE_C_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gcc)
+set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-10/root/usr/bin/g++)
 set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
-set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gfortran)
+set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gfortran)
Author	SHA1	Message	Date
Bensuperpc	e5ed0f45e6	Merge remote-tracking branch 'origin/master' into uptate_cmake	2021-08-07 00:59:45 +02:00
Bensuperpc	d2fb4755f0	Merge pull request #546 from bensuperpc/fix_manylinux2014 Fix manylinux2014x86 and manylinux2014x64, update to devtoolset-10	2021-08-07 00:58:43 +02:00
Bensuperpc	ea2c1635ff	Update CMake to 3.21.1 Update CMake to 3.21.1 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-06 22:54:32 +02:00
Bensuperpc	76d1ec682f	Fix shellcheck Fix shellcheck Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-06 21:54:37 +02:00
Bensuperpc	cc949d6a85	Add mirror for CMake Add mirror: https://github.com/Kitware/CMake Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-06 21:53:09 +02:00
Bensuperpc	e25f67aea9	Fix manylinux and update to devtoolset-10 Fix manylinux and update to devtoolset-10 Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-06 20:50:46 +02:00
Bensuperpc	aa4bcf4a34	Merge pull request #545 from bensuperpc/update_readme-armv6 Add linux-armv6-lts in Readme	2021-08-06 20:26:56 +02:00
Bensuperpc	7ec0eaa3c9	Add linux-armv6-lts in Readme Add linux-armv6-lts in Readme Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-06 20:23:31 +02:00
Bensuperpc	09e8f01e94	Merge pull request #538 from bensuperpc/update_makefile Update makefile	2021-08-06 19:56:28 +02:00