Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-11-15 07:21:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update manylinux

Browse Source
This commit is contained in:
Bensuperpc 2021-05-07 10:58:30 +02:00
parent 1a690e94e3
commit ab590f3fdd
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common-manylinux.crosstool
View File

@ -16,7 +16,7 @@
ENV MANYLINUX_DEPS="glibc-devel glibc-devel.i686 libstdc++-devel glib2-devel libX11-devel libXext-devel libXrender-devel mesa-libGL-devel libICE-devel libSM-devel" ENV MANYLINUX_DEPS="glibc-devel glibc-devel.i686 libstdc++-devel glib2-devel libX11-devel libXext-devel libXrender-devel mesa-libGL-devel libICE-devel libSM-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 PYTHON_COMPILE_DEPS="python3-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-9-binutils devtoolset-9-gcc devtoolset-9-gcc-c++ devtoolset-9-gcc-gfortran"
@ -38,6 +38,9 @@ RUN \
${MANYLINUX_DEPS} && \ ${MANYLINUX_DEPS} && \
yum clean all yum clean all
# Add symlink for compatibility
RUN ln -s /usr/bin/python3 /usr/bin/python
ENV XCC_PREFIX=/usr/xcc ENV XCC_PREFIX=/usr/xcc
# Add the crosstool-ng script and image-specific toolchain configuration into # Add the crosstool-ng script and image-specific toolchain configuration into
@ -47,7 +50,6 @@ ENV XCC_PREFIX=/usr/xcc
# for users. # for users.
COPY \ COPY \
imagefiles/install-crosstool-ng-toolchain.sh \ imagefiles/install-crosstool-ng-toolchain.sh \
imagefiles/crosstool-ng-expat.patch \
manylinux2014-aarch64/crosstool-ng.config \ manylinux2014-aarch64/crosstool-ng.config \
/dockcross/ /dockcross/

13
web-wasm/Dockerfile.in
View File

@ -1,4 +1,4 @@
FROM emscripten/emsdk:2.0.4 FROM emscripten/emsdk:2.0.20
MAINTAINER Matt McCormick "matt.mccormick@kitware.com" MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
# Revert back to "/bin/sh" as default shell # Revert back to "/bin/sh" as default shell
@ -9,10 +9,6 @@ ARG DEBIAN_FRONTEND=noninteractive
ARG REPO=http://cdn-fastly.deb.debian.org ARG REPO=http://cdn-fastly.deb.debian.org
RUN \ RUN \
bash -c "echo \"deb $REPO/debian buster main contrib non-free\" > /etc/apt/sources.list" && \
bash -c "echo \"deb $REPO/debian buster-updates main contrib non-free\" >> /etc/apt/sources.list" && \
bash -c "echo \"deb $REPO/debian-security buster/updates main\" >> /etc/apt/sources.list" && \
bash -c "echo \"deb http://ftp.debian.org/debian buster-backports main\" >> /etc/apt/sources.list" && \
apt-get update --yes && \ apt-get update --yes && \
apt-get install --no-install-recommends --yes \ apt-get install --no-install-recommends --yes \
automake \ automake \
@ -35,8 +31,8 @@ RUN \
ncurses-dev \ ncurses-dev \
pkg-config \ pkg-config \
libtool \ libtool \
python \ python3 \
python-pip \ python3-pip \
rsync \ rsync \
sed \ sed \
ssh \ ssh \
@ -51,6 +47,9 @@ RUN \
&& \ && \
apt-get clean --yes apt-get clean --yes
# Add symlink for compatibility
RUN ln -s /usr/bin/python3 /usr/bin/python
#include "common.dockcross" #include "common.dockcross"
#include "common.docker" #include "common.docker"