Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-10-26 05:56:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bensuperpc
2021-08-07 00:59:45 +02:00
parent ea2c1635ff d2fb4755f0
commit e5ed0f45e6
7 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/common-manylinux.crosstool
View File

@@ -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 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`. # Install dependent packages required for `ct-ng`.
RUN \ RUN \
@@ -62,7 +62,7 @@ RUN \
rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && \ rm -rf /dockcross/crosstool /dockcross/install-crosstool-ng-toolchain.sh && \
# Remove sudo provided by devtoolset since it doesn't work with # Remove sudo provided by devtoolset since it doesn't work with
# our sudo wrapper calling gosu. # 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"). # Restore our default workdir (from "dockcross/base").
WORKDIR /work WORKDIR /work

1
common/common.manylinux
View File

@@ -23,6 +23,7 @@ RUN \
rm -f /opt/rh/devtoolset-7/root/usr/bin/sudo && \ 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-8/root/usr/bin/sudo && \
rm -f /opt/rh/devtoolset-9/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 && \ /buildscripts/install-python-packages.sh && \
rm -rf /buildscripts rm -rf /buildscripts

7
imagefiles/build-and-install-cmake.sh
View File

@@ -4,6 +4,9 @@ set -ex
WRAPPER="" WRAPPER=""
CMAKE_URL="https://gitlab.kitware.com/cmake/cmake.git"
CMAKE_MIRROR_URL="https://github.com/Kitware/CMake.git"
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
-32) -32)
@@ -29,7 +32,9 @@ fi
cd /usr/src 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 mkdir /usr/src/CMake-build
cd /usr/src/CMake-build cd /usr/src/CMake-build

2
manylinux2014-x64/Dockerfile.in
View File

@@ -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 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_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 \ ENV AS=${CROSS_ROOT}/as \
AR=${CROSS_ROOT}/ar \ AR=${CROSS_ROOT}/ar \
CC=${CROSS_ROOT}/gcc \ CC=${CROSS_ROOT}/gcc \

6
manylinux2014-x64/Toolchain.cmake
View File

@@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(MANYLINUX2014 TRUE) set(MANYLINUX2014 TRUE)
set(CMAKE_C_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gcc) set(CMAKE_C_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gcc)
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-9/root/usr/bin/g++) set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-10/root/usr/bin/g++)
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) 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)

2
manylinux2014-x86/Dockerfile.in
View File

@@ -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 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_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 \ ENV AS=${CROSS_ROOT}/as \
AR=${CROSS_ROOT}/ar \ AR=${CROSS_ROOT}/ar \
CC=${CROSS_ROOT}/gcc \ CC=${CROSS_ROOT}/gcc \

6
manylinux2014-x86/Toolchain.cmake
View File

@@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR i686)
set(MANYLINUX2014 TRUE) set(MANYLINUX2014 TRUE)
set(CMAKE_C_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gcc) set(CMAKE_C_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gcc)
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-9/root/usr/bin/g++) set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-10/root/usr/bin/g++)
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) 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)