mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-11-10 05:07:26 +01:00
Update to python 3.9.5, fix build fail with manylinuximage
Update to python 3.9.5, fix build fail with manylinuximage Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
parent
7a475a0f4a
commit
8ff660facd
2
.github/workflows/main.yml
vendored
2
.github/workflows/main.yml
vendored
@ -3,7 +3,7 @@ name: Dockcross CI
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- 'master'
|
- '*'
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- '*'
|
- '*'
|
||||||
|
@ -30,8 +30,8 @@ RUN \
|
|||||||
ncurses-dev \
|
ncurses-dev \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
pax \
|
pax \
|
||||||
python \
|
# python3 \
|
||||||
python-pip \
|
# python3-pip \
|
||||||
rsync \
|
rsync \
|
||||||
sed \
|
sed \
|
||||||
ssh \
|
ssh \
|
||||||
@ -41,5 +41,23 @@ RUN \
|
|||||||
xz-utils \
|
xz-utils \
|
||||||
zip \
|
zip \
|
||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
|
# python build
|
||||||
|
libncurses5-dev \
|
||||||
|
libgdbm-dev \
|
||||||
|
libnss3-dev \
|
||||||
|
libssl-dev \
|
||||||
|
libsqlite3-dev \
|
||||||
|
libreadline-dev \
|
||||||
|
libffi-dev \
|
||||||
|
libbz2-dev\
|
||||||
&& \
|
&& \
|
||||||
apt-get clean --yes
|
apt-get clean --yes
|
||||||
|
|
||||||
|
# build and install python
|
||||||
|
COPY \
|
||||||
|
imagefiles/build-and-install-python.sh \
|
||||||
|
/buildscripts/
|
||||||
|
RUN \
|
||||||
|
set -x && \
|
||||||
|
/buildscripts/build-and-install-python.sh && \
|
||||||
|
rm -rf /buildscripts
|
@ -8,6 +8,7 @@ RUN \
|
|||||||
yum -y install \
|
yum -y install \
|
||||||
$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "" || echo "epel-release") \
|
$([ "$DEFAULT_DOCKCROSS_IMAGE" = "dockcross/manylinux2014-x86" ] && echo "" || echo "epel-release") \
|
||||||
gpg \
|
gpg \
|
||||||
|
python3-devel \
|
||||||
zlib-devel \
|
zlib-devel \
|
||||||
gettext \
|
gettext \
|
||||||
openssh-clients \
|
openssh-clients \
|
||||||
|
40
imagefiles/build-and-install-python.sh
Executable file
40
imagefiles/build-and-install-python.sh
Executable file
@ -0,0 +1,40 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
#
|
||||||
|
# Configure, build and install python
|
||||||
|
#
|
||||||
|
# Usage:
|
||||||
|
#
|
||||||
|
# build-and-install-python.sh [-version 3.9.5]
|
||||||
|
|
||||||
|
PYTHON_VERSION=3.9.5
|
||||||
|
while [ $# -gt 0 ]; do
|
||||||
|
case "$1" in
|
||||||
|
-version|-v)
|
||||||
|
PYTHON_VERSION=$2
|
||||||
|
shift
|
||||||
|
;;&
|
||||||
|
*)
|
||||||
|
echo "Usage: Usage: ${0##*/} [-version 3.9.5]"
|
||||||
|
exit 1
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
|
||||||
|
# Download
|
||||||
|
wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
|
||||||
|
tar xvf Python-${PYTHON_VERSION}.tgz
|
||||||
|
# Configure, build and install
|
||||||
|
cd Python-${PYTHON_VERSION}
|
||||||
|
# Disable --enable-shared --enable-optimizations --prefix=/usr/local/python-${PYTHON_VERSION}
|
||||||
|
./configure --with-ensurepip=install
|
||||||
|
make -j$(nproc)
|
||||||
|
make install #altinstall
|
||||||
|
|
||||||
|
ln -s /usr/local/bin/python3 /usr/local/bin/python
|
||||||
|
ln -s /usr/local/bin/pip3 /usr/local/bin/pip
|
||||||
|
|
||||||
|
# Clean
|
||||||
|
cd ..
|
||||||
|
rm -rf Python-${PYTHON_VERSION}
|
@ -22,8 +22,8 @@ cd /tmp
|
|||||||
|
|
||||||
# Todo: Need to update base image from Debian Stretch for the required Python
|
# Todo: Need to update base image from Debian Stretch for the required Python
|
||||||
# 3.6 or later
|
# 3.6 or later
|
||||||
# curl -# -LO https://bootstrap.pypa.io/pip/get-pip.py
|
curl -# -LO https://bootstrap.pypa.io/pip/get-pip.py
|
||||||
curl -# -LO https://bootstrap.pypa.io/pip/2.7/get-pip.py
|
#curl -# -LO https://bootstrap.pypa.io/pip/2.7/get-pip.py
|
||||||
${PYTHON} get-pip.py --ignore-installed
|
${PYTHON} get-pip.py --ignore-installed
|
||||||
rm get-pip.py
|
rm get-pip.py
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user