Skip to content

Commit fefa34f

Browse files
longnguyen2004mstorsjo
authored andcommitted
build-python: Update to v3.9.7, remove patches
Also add gitignores/dockerignores for directories created during the python build.
1 parent 4b34c42 commit fefa34f

6 files changed

+8
-177
lines changed

.dockerignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ mingw-w64
44
libssp
55
lldb-mi
66
make-*
7+
libffi
8+
cpython*
9+
python-native
710
**/*.exe
811
**/*.dll
912
**/*.lib

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
/libssp
44
/lldb-mi
55
/make-*
6+
/libffi
7+
/cpython*
8+
/python-native

Dockerfile.cross

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ RUN apt-get update -qq && \
1717
rm -rf /var/lib/apt/lists/*
1818

1919
COPY build-python.sh .
20-
COPY patches/python/ ./patches/python/
2120

2221
ARG WITH_PYTHON
2322

build-python.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,8 @@
1717
set -e
1818

1919
: ${LIBFFI_VERSION:=v3.4.2}
20-
: ${PYTHON_MAJOR:=3}
21-
: ${PYTHON_MINOR:=9}
22-
: ${PYTHON_PATCH:=6}
23-
: ${PYTHON_VERSION:=v${PYTHON_MAJOR}.${PYTHON_MINOR}.${PYTHON_PATCH}}
24-
: ${PYTHON_VERSION_MINGW:=61c5a4a14932539b31878de0b60bc98bcba791b9}
20+
: ${PYTHON_VERSION:=v3.9.7}
21+
: ${PYTHON_VERSION_MINGW:=8736112bab36bc8f0612f33237f64473640ff3b8}
2522

2623
unset HOST
2724

@@ -120,9 +117,7 @@ fi
120117
if [ -n "$SYNC" ] || [ -n "$CHECKOUT_PYTHON" ]; then
121118
cd cpython-mingw
122119
[ -z "$SYNC" ] || git fetch
123-
git reset --hard
124120
git checkout $PYTHON_VERSION_MINGW
125-
cat ../patches/python/*.patch | patch -Nup1
126121
autoreconf -vfi
127122
cd ..
128123
fi
@@ -144,7 +139,6 @@ mkdir -p $BUILDDIR
144139
cd $BUILDDIR
145140
BUILD=$(../config.guess) # Python configure requires build triplet for cross compilation
146141

147-
# Avoid gcc workarounds in distutils
148142
export CC=$HOST-clang
149143
export CXX=$HOST-clang++
150144

patches/python/distutils-clang-mingw.patch

Lines changed: 0 additions & 155 deletions
This file was deleted.

patches/python/fix-python-build-detection.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)