Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update python to 3.11.6 #660

Merged
merged 3 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@ readonly REVERSE_ARCHITECTURE=$(func_get_reverse_arch $BUILD_ARCHITECTURE)
[[ -z ${BUILD_ARCHITECTURE} ]] && { echo -n "any"; } || { echo -n "${BUILD_ARCHITECTURE}"; }
[[ -z ${EXCEPTIONS_MODEL} ]] && { echo ""; } || { echo "-${EXCEPTIONS_MODEL}"; }
} || {
echo -n "${BUILD_ARCHITECTURE}"
echo "${BUILD_ARCHITECTURE}"
}
} || {
[[ $BUILD_MODE == gcc ]] && {
Expand Down
1 change: 1 addition & 0 deletions library/config-win.sh
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ function func_test_installed_packages {
texinfo
autogen
dejagnu
pkgconf
)

echo "--> installing required packages..."
Expand Down
14 changes: 14 additions & 0 deletions patches/Python3/python-3.11-remove-WASM_STDLIB-target.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
diff --git a/Makefile.pre.in b/Makefile.pre.in
index d5a9e2b8aa..2137d8ab13 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -857,8 +857,7 @@ $(DLLLIBRARY) libpython$(LDVERSION).dll.a: $(LIBRARY_OBJS) python_nt.o
# --preload-file turns a relative asset path into an absolute path.

.PHONY: wasm_stdlib
-wasm_stdlib: $(WASM_STDLIB)
-$(WASM_STDLIB): $(srcdir)/Lib/*.py $(srcdir)/Lib/*/*.py \
+wasm_stdlib: $(srcdir)/Lib/*.py $(srcdir)/Lib/*/*.py \
$(srcdir)/Tools/wasm/wasm_assets.py \
Makefile pybuilddir.txt Modules/Setup.local
$(PYTHON_FOR_BUILD) $(srcdir)/Tools/wasm/wasm_assets.py \
1 change: 1 addition & 0 deletions scripts/3rdparty-post.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ function python_deps_post {
rm -f $LIBS_DIR/bin/{infotocap.exe,c_rehash,ncursesw5-config,reset.exe,sqlite3.exe,tabs.exe}
rm -f $LIBS_DIR/bin/{tic.exe,toe.exe,tput.exe,tset.exe,wish.exe,wish86.exe,xmlwf,testgdbm.exe}
rm -f $LIBS_DIR/bin/{lzmadec.exe,lzmainfo.exe,unxz.exe,xz*}
rm -f $LIBS_DIR/bin/*-w64-mingw32-{captoinfo.exe,clear.exe,infocmp.exe,infotocap.exe,reset.exe,tabs.exe,tic.exe,toe.exe,tput.exe,tset.exe}

#rm -rf $LIBS_DIR/include
rm -rf $LIBS_DIR/lib/pkgconfig
Expand Down
6 changes: 3 additions & 3 deletions scripts/gdb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ PKG_CONFIGURE_FLAGS=(
--disable-gdbtk
#
# the _WIN32_WINNT hack here because of: https://sourceware.org/pipermail/gdb/2022-November/050432.html
CFLAGS="\"$COMMON_CFLAGS -D__USE_MINGW_ANSI_STDIO=1 -fcommon -D_WIN32_WINNT=0x0601\""
CXXFLAGS="\"$COMMON_CXXFLAGS -D__USE_MINGW_ANSI_STDIO=1 -D_WIN32_WINNT=0x0601\""
CPPFLAGS="\"$COMMON_CPPFLAGS\""
CFLAGS="\"$COMMON_CFLAGS -I$LIBS_DIR/include/ncursesw -D__USE_MINGW_ANSI_STDIO=1 -fcommon -DNCURSES_STATIC -D_WIN32_WINNT=0x0601\""
CXXFLAGS="\"$COMMON_CXXFLAGS -I$LIBS_DIR/include/ncursesw -D__USE_MINGW_ANSI_STDIO=1 -DNCURSES_STATIC -D_WIN32_WINNT=0x0601\""
CPPFLAGS="\"$COMMON_CPPFLAGS -I$LIBS_DIR/include/ncursesw -D__USE_MINGW_ANSI_STDIO=1 -DNCURSES_STATIC -D_WIN32_WINNT=0x0601\""
LDFLAGS="\"$COMMON_LDFLAGS $( [[ $BUILD_ARCHITECTURE == i686 ]] && echo -Wl,--large-address-aware )\""
)

Expand Down
10 changes: 4 additions & 6 deletions scripts/libffi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,19 @@

# **************************************************************************

PKG_VERSION=3.2.1
PKG_VERSION=3.4.4
PKG_NAME=libffi-${PKG_VERSION}
PKG_DIR_NAME=libffi-${PKG_VERSION}
PKG_TYPE=.tar.gz
PKG_URLS=(
"https://sourceware.org/pub/libffi/libffi-${PKG_VERSION}${PKG_TYPE}"
"https://github.com/libffi/libffi/releases/download/v${PKG_VERSION}/libffi-${PKG_VERSION}${PKG_TYPE}"
)

PKG_PRIORITY=extra

#

PKG_PATCHES=(
libffi/fix_return_size.patch
)
PKG_PATCHES=()

#

Expand All @@ -60,7 +58,7 @@ PKG_CONFIGURE_FLAGS=(
#
--prefix=$LIBS_DIR
#
$LINK_TYPE_STATIC
$LINK_TYPE_SHARED
#
CFLAGS="\"$COMMON_CFLAGS\""
CXXFLAGS="\"$COMMON_CXXFLAGS\""
Expand Down
14 changes: 8 additions & 6 deletions scripts/python-3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

# **************************************************************************

PKG_VERSION=3.9.10
PKG_VERSION=3.11.6
PKG_NAME=Python-${PKG_VERSION}
PKG_DIR_NAME=Python-${PKG_VERSION}
PKG_TYPE=git
Expand All @@ -48,13 +48,13 @@ PKG_PRIORITY=extra
#

PKG_EXECUTE_AFTER_UNCOMPRESS=(
"git reset --hard 12d1cb5" # Reset to this commit hash for reproducible builds
"git reset --hard f8ce319d46c25b8afe6083284315169d8f418880" # Reset to this commit hash for reproducible builds
)

#

PKG_PATCHES=(
python3/0100-get-libraries-tuple-append-list.patch
Python3/python-3.11-remove-WASM_STDLIB-target.patch
)

#
Expand Down Expand Up @@ -101,10 +101,12 @@ PKG_CONFIGURE_FLAGS=(
# --with-tzpath=$LIBS_DIR/share/zoneinfo
--enable-optimizations
#
LIBFFI_INCLUDEDIR="$LIBSW_DIR/lib/libffi-$LIBFFI_VERSION/include"
CFLAGS="\"$COMMON_CFLAGS -D__USE_MINGW_ANSI_STDIO=1\""
CPPFLAGS="\"$COMMON_CPPFLAGS $MY_CPPFLAGS\""
LIBFFI_INCLUDEDIR="$LIBSW_DIR/include"
PKG_CONFIG_PATH="$PREREQ_DIR/$BUILD_ARCHITECTURE-zlib-$LINK_TYPE_SUFFIX/lib/pkgconfig:$LIBS_DIR/lib/pkgconfig"
CFLAGS="\"$COMMON_CFLAGS $MY_CPPFLAGS -D__USE_MINGW_ANSI_STDIO=1 -DNCURSES_STATIC\""
CPPFLAGS="\"$COMMON_CPPFLAGS $MY_CPPFLAGS -D__USE_MINGW_ANSI_STDIO=1 -DNCURSES_STATIC\""
LDFLAGS="\"$COMMON_LDFLAGS -L$PREREQW_DIR/$BUILD_ARCHITECTURE-zlib-$LINK_TYPE_SUFFIX/lib -L$LIBSW_DIR/lib\""
LIBS="\"-lffi -ltcl -ltk -lole32 -loleaut32 -luuid\""
)

#
Expand Down
Loading