python3.11: update to version 3.11.7 (#9874)

This commit is contained in:
OscarL
2023-12-11 04:24:31 -03:00
committed by GitHub
parent 407de81974
commit c7132aa43c
3 changed files with 42 additions and 38 deletions

View File

@@ -0,0 +1,41 @@
From f85c391be71e71e7d07d579aef5e059bd3df3fe6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sat, 3 Feb 2018 11:33:49 +0100
Subject: Fix include paths for secondary x86
This helps python find libraries and dependencies properly (openssl,
etc), so a few more modules are enabled.
It also fixes a crash because python would try to load the gcc2 libroot
even when built with gcc5.
diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
index 2b4f04c..dab556c 100644
--- a/Lib/ctypes/util.py
+++ b/Lib/ctypes/util.py
@@ -286,6 +286,7 @@ elif os.name == "posix":
directory = directory.replace('%A',
os.path.dirname(os.path.abspath(sys.argv[0] or os.getcwd())))
+ directory = os.path.join(directory, "x86")
if not os.path.isdir(directory):
continue
diff --git a/setup.py b/setup.py
index dc42f39..1c6db8f 100644
--- a/setup.py
+++ b/setup.py
@@ -894,8 +894,8 @@ class PyBuildExt(build_ext):
# Haiku-specific library locations
if HAIKU:
self.inc_dirs += ['/boot/develop/headers/posix',
- '/boot/system/develop/headers']
- self.lib_dirs += ['/boot/system/develop/lib']
+ '/boot/system/develop/headers/x86']
+ self.lib_dirs += ['/boot/system/develop/lib/x86']
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
if HOST_PLATFORM in ['osf1', 'unixware7', 'openunix8']:
self.lib_dirs += ['/usr/ccs/lib']
--
2.42.1