Skip to content

Commit

Permalink
Updates for Python 3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
culler committed Jun 27, 2024
1 parent 84a3d68 commit 1bc7a42
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 46 deletions.
14 changes: 8 additions & 6 deletions Python-3.11/build_python.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@ set -e
cd `dirname $0`
BASE_DIR=`pwd`
VERSION=3.11
LONG_VERSION=3.11.4
LONG_VERSION=3.11.8
VRSN=311
TCLTK_VERSION=9.0
SRC_DIR=python-${LONG_VERSION}
SRC_ARCHIVE=Python-${LONG_VERSION}.tgz
URL=https://www.python.org/ftp/python/${LONG_VERSION}/Python-${LONG_VERSION}.tgz
HASH=bf6ec50f2f3bfa6ffbdb385286f2c628
HASH=7fb0bfaa2f6aae4aadcdb51abe957825
FRAMEWORKS=${BASE_DIR}/../Frameworks
TCL_HEADERS=${FRAMEWORKS}/Tcl.framework/Versions/8.7/Headers
TCL_LIB=${FRAMEWORKS}/Tcl.framework/Versions/8.7/Tcl
TK_HEADERS=${FRAMEWORKS}/Tk.framework/Versions/8.7/Headers
TK_LIB=${FRAMEWORKS}/Tk.framework/Versions/8.7/Tk
TCL_HEADERS=${FRAMEWORKS}/Tcl.framework/Versions/${TCLTK_VERSION}/Headers
TCL_LIB=${FRAMEWORKS}/Tcl.framework/Versions/${TCLTK_VERSION}/Tcl
TK_HEADERS=${FRAMEWORKS}/Tk.framework/Versions/${TCLTK_VERSION}/Headers
TK_LIB=${FRAMEWORKS}/Tk.framework/Versions/${TCLTK_VERSION}/Tk
OPENSSL=${FRAMEWORKS}/OpenSSL.framework/Versions/Current
READLINE=${FRAMEWORKS}/Readline.framework/Versions/Current
RSRC_DIR=${BASE_DIR}/dist/Python.framework/Versions/${VERSION}/Resources
Expand All @@ -31,6 +32,7 @@ if ! [ -d ${SRC_DIR} ]; then
pushd ${SRC_DIR}
patch -p0 < ../patches/configure.patch
patch -p0 < ../patches/tkinter.patch
patch -p0 < ../patches/_tkinter.patch
popd
fi
if ! [ -d dist ]; then
Expand Down
47 changes: 7 additions & 40 deletions Python-3.11/patches/configure.patch
Original file line number Diff line number Diff line change
@@ -1,52 +1,19 @@
*** configure Fri Oct 27 08:50:50 2023
--- configure.new Fri Oct 27 08:59:12 2023
*** configure.orig Sun Apr 28 12:12:24 2024
--- configure Sun Apr 28 12:13:32 2024
***************
*** 4243,4249 ****
*** 23168,23174 ****



! printf "%s\n" "#define _PYTHONFRAMEWORK \"${PYTHONFRAMEWORK}\"" >>confdefs.h


# Set name for machine-dependent library files
--- 4243,4249 ----



! printf "%s\n" "#define _PYTHONFRAMEWORK \"Python\"" >>confdefs.h


# Set name for machine-dependent library files
***************
*** 10551,10563 ****
printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h

fi
- ac_fn_c_check_header_compile "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
- if test "x$ac_cv_header_libintl_h" = xyes
- then :
- printf "%s\n" "#define HAVE_LIBINTL_H 1" >>confdefs.h
-
- fi
- ac_fn_c_check_header_compile "$LINENO" "libutil.h" "ac_cv_header_libutil_h" "$ac_includes_default"
if test "x$ac_cv_header_libutil_h" = xyes
then :
printf "%s\n" "#define HAVE_LIBUTIL_H 1" >>confdefs.h
--- 10551,10556 ----
***************
*** 28081,28087 ****

else $as_nop
else

! rpath_arg="-Wl,-rpath="

fi

--- 28074,28080 ----
--- 23168,23174 ----

else $as_nop
else

! rpath_arg="-rpath "
! rpath_arg="-Wl,-rpath,"

fi

0 comments on commit 1bc7a42

Please sign in to comment.