Skip to content

Commit f5a724f

Browse files
author
Release Manager
committed
gh-37914: `build/pkgs/python3`: Update to 3.11.8, remove Cygwin patches, remove pointless rpaths on macOS <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes #12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes #12345". --> Author: @culler Split out from: - #37886 ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [x] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - #12345: short description why this is a dependency --> <!-- - #34567: ... --> URL: #37914 Reported by: Matthias Köppe Reviewer(s):
2 parents 2627932 + 9a6c210 commit f5a724f

File tree

6 files changed

+17
-100
lines changed

6 files changed

+17
-100
lines changed

build/pkgs/python3/checksums.ini

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=Python-VERSION.tar.xz
2-
sha1=89ee31611b73dc0c32c178d15aa208734b462c5a
3-
md5=4efe92adf28875c77d3b9b2e8d3bc44a
4-
cksum=2916176597
2+
sha1=a368aeed7a3325e47b55168452c356a8eb27ab50
3+
md5=b353b8433e560e1af2b130f56dfbd973
4+
cksum=534846730
55
upstream_url=https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.11.1
1+
3.11.8

build/pkgs/python3/patches/2.6.5-FD_SETSIZE.patch

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

build/pkgs/python3/patches/2.7.3-dylib.patch

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

build/pkgs/python3/patches/3.2.6-no-enable-new-dtags.patch

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

build/pkgs/python3/spkg-build.in

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,25 +73,26 @@ sdh_configure --enable-shared $PYTHON_CONFIGURE
7373
# we need to provide paths into $SAGE_LOCAL, so that setup.py finds
7474
# the libraries needed for the extension modules - in particular sqlite3.
7575
# (The search code there does not know about CPATH and LIBRARY_PATH.)
76-
make_LDFLAGS="-L. -Wl,-rpath,. -L$SAGE_LOCAL/lib $LDFLAGS"
77-
make_CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS"
7876

79-
# Also, we need to add an rpath, like we do for SAGE_LOCAL in src/bin/sage-env.
80-
# SAGE_INST_LOCAL is the installation hierarchy for the current package
81-
# -- for python3, this is SAGE_VENV.
82-
make_LDFLAGS="-Wl,-rpath,$SAGE_INST_LOCAL/lib $make_LDFLAGS"
77+
if [ "$UNAME" = "Darwin" ]; then
78+
make_LDFLAGS="-L$SAGE_LOCAL/lib -L$SAGE_INST_LOCAL/lib $LDFLAGS"
79+
# This enables python to find libpython
80+
export DYLD_LIBRARY_PATH="."
81+
fi
8382
if [ "$UNAME" = "Linux" ]; then
83+
make_LDFLAGS="-L. -Wl,-rpath,. -L$SAGE_LOCAL/lib $LDFLAGS"
84+
make_CPPFLAGS="-I$SAGE_LOCAL/include $CPPFLAGS"
85+
# Also, we need to add an rpath, like we do for SAGE_LOCAL in src/bin/sage-env.
86+
# SAGE_INST_LOCAL is the installation hierarchy for the current package
87+
# -- for python3, this is SAGE_VENV.
88+
make_LDFLAGS="-Wl,-rpath,$SAGE_INST_LOCAL/lib $make_LDFLAGS"
8489
make_LDFLAGS="-Wl,-rpath-link,$SAGE_INST_LOCAL/lib $make_LDFLAGS"
90+
# This enables python to find libpython
91+
export LD_LIBRARY_PATH="."
8592
fi
8693

8794
sdh_make LDFLAGS="$make_LDFLAGS" CPPFLAGS="$make_CPPFLAGS"
8895

89-
if [ "$UNAME" = "Darwin" ]; then
90-
export DYLD_LIBRARY_PATH="."
91-
else
92-
export LD_LIBRARY_PATH="."
93-
fi
94-
9596
# When building on a case-insensitive filesystem (on any OS, not just Windows)
9697
# the Python executable is output to the build directory as 'python.exe'
9798
if [ -f "python.exe" ]; then

0 commit comments

Comments
 (0)