haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

python3.14: update to 3.14.0 beta 2. (#12443)

Browse Source 
Disabled "forceParallelBuild" as I got a build failure again using that.
This commit is contained in:
OscarL
2025-05-28 09:10:41 -03:00
committed by GitHub
parent 1e21494c24
commit b5a422d2a2
2 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
dev-lang/python/patches/python3.14-3.14.0~b1.patchset → dev-lang/python/patches/python3.14-3.14.0~b2.patchset
View File

@@ -1,4 +1,4 @@
From 842faa1e37d23baf52de92c44c67268d7fe10102 Mon Sep 17 00:00:00 2001
From 4975f27b26de8f77cbe6a2ad1fe956b2bf5bacd8 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 8 Oct 2023 01:02:25 -0300
Subject: initial Haiku patch
@@ -22,7 +22,7 @@ index 3eac119..1e5df7e 100644
// See PyUnicode_DecodeFSDefaultAndSize(), PyUnicode_EncodeFSDefault(),
// Py_DecodeLocale() and Py_EncodeLocale().
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 17e0c99..87b9c15 100644
index b5703fb..f7dfa7a 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -156,7 +156,7 @@ BINDIR= @bindir@
@@ -148,7 +148,7 @@ index 63624d5..3692640 100644
#include <bluetooth/bluetooth.h>
#include <bluetooth/rfcomm.h>
diff --git a/configure.ac b/configure.ac
index a7b2f62..2579824 100644
index cf25148..8d2e08b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1584,6 +1584,16 @@ if test $enable_shared = "yes"; then
@@ -185,7 +185,7 @@ index a7b2f62..2579824 100644
# -u libsys_s pulls in all symbols in libsys
Darwin/*|iOS/*)
LINKFORSHARED="$extra_undefs -framework CoreFoundation"
@@ -5856,6 +5867,7 @@ AC_CHECK_FUNC([__fpu_control],
@@ -5963,6 +5974,7 @@ AC_CHECK_FUNC([__fpu_control],
AC_SUBST([LIBM])
case $ac_sys_system in
Darwin) ;;
@@ -197,7 +197,7 @@ index a7b2f62..2579824 100644
2.48.1
From 345d40b40d53beff9c406ce45a7058b9a8d82180 Mon Sep 17 00:00:00 2001
From d53308e69eb7fe75a819d3fe88ae6ce235e9a5cc Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 16 Apr 2017 10:05:42 +0200
Subject: fix for negative errnos
@@ -235,7 +235,7 @@ index b542f86..a996ebf 100644
2.48.1
From c8f81ae70b94579c266b27c69a227ec6149edf1a Mon Sep 17 00:00:00 2001
From 467523d7cdb385ea7b9580ae71ee01aef10b438f Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 8 Oct 2023 20:06:31 -0300
Subject: Implement CTypes's find_library for Haiku
@@ -332,7 +332,7 @@ index 9950491..fefae29 100644
2.48.1
From 1b9110b05fad43f085c2af75669365d5c509663b Mon Sep 17 00:00:00 2001
From b1b31c12baf7f2134d2ca30d16a7da0ee0e0a80e Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Mon, 23 Sep 2019 09:14:58 +0200
Subject: webbrowser: Support for default browsers on Haiku
@@ -359,14 +359,14 @@ index f2e2394..b937321 100644
2.48.1
From 2e81cbfefa905692e6cae8ecedfe54c5ea50ff9b Mon Sep 17 00:00:00 2001
From 8558ec800b69ad63cdfe5794e91ed332895a980e Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 4 Oct 2019 22:02:35 +0200
Subject: since 3.8, don't reinit locks on fork.
diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py
index aa9b79d..b99e1e0 100644
index 357d127..009fc95 100644
--- a/Lib/logging/__init__.py
+++ b/Lib/logging/__init__.py
@@ -253,7 +253,7 @@ def _afterFork():
@@ -382,7 +382,7 @@ index aa9b79d..b99e1e0 100644
2.48.1
From ef1e9f0006c624d6b6bbf4613c8a9d86e53d35ff Mon Sep 17 00:00:00 2001
From 6bc88b0ccc74094226ffcb664e10e9a398915e04 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 15 May 2020 15:20:57 +0200
Subject: handle errors returned by internal_connect()
@@ -390,10 +390,10 @@ Subject: handle errors returned by internal_connect()
upstream bug #40628 by Ryan C. Gordon
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
index 4795837..5483752 100644
index 92c9aa8..82cdf0e 100644
--- a/Modules/socketmodule.c
+++ b/Modules/socketmodule.c
@@ -3741,7 +3741,7 @@ sock_connect(PyObject *self, PyObject *addro)
@@ -3721,7 +3721,7 @@ sock_connect(PyObject *self, PyObject *addro)
}
res = internal_connect(s, SAS2SA(&addrbuf), addrlen, 1);
@@ -406,7 +406,7 @@ index 4795837..5483752 100644
2.48.1
From 90979d230221e131a9d799a9075796f96c8050bb Mon Sep 17 00:00:00 2001
From e42f5fc98f2108b8498581d982641f97741948ca Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 19 Oct 2020 18:03:09 +0200
Subject: ttyname_r can use MAXPATHLEN
@@ -436,7 +436,7 @@ index 922694f..93a2658 100644
2.48.1
From ad0a0f5693982d150ebe05e3132c7021c191a41b Mon Sep 17 00:00:00 2001
From 5f87b4cfa44e048841ae381dac79d1208c00e1bf Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Mon, 24 Oct 2022 20:04:10 -0300
Subject: Lib/test: require the "largefile" usage flag for I/O heavy tests.
@@ -447,7 +447,7 @@ This avoids needing several GBs of storage to run the tests
(unless the "largefile" resource usage flag is enabled).
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 5a8f194..5452192 100644
index 168e66c..d5c2ddf 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -652,7 +652,7 @@ class IOTest(unittest.TestCase):
@@ -489,7 +489,7 @@ index fd4197b..662954d 100644
2.48.1
From 15f9a4b465dd6b872d71297a34bda0769cb21ee2 Mon Sep 17 00:00:00 2001
From 763b072621be038676d1ae05e61a6c7ccecc99c9 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sat, 27 Jul 2024 04:51:52 -0300
Subject: _getuserbase(), getsitepackages(), and INSTALL_SCHEMES for Haiku.
@@ -516,10 +516,10 @@ by me, plus:
The idea was to have all _getuserbase()/INSTALL_SCHEMES related changes in "one place".
diff --git a/Lib/site.py b/Lib/site.py
index 5c38b1b..f0f5ba5 100644
index f932719..c1fe2a4 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -312,6 +312,14 @@ def _getuserbase():
@@ -313,6 +313,14 @@ def _getuserbase():
return joinuser("~", "Library", sys._framework,
"%d.%d" % sys.version_info[:2])
@@ -534,7 +534,7 @@ index 5c38b1b..f0f5ba5 100644
return joinuser("~", ".local")
@@ -404,7 +412,31 @@ def getsitepackages(prefixes=None):
@@ -405,7 +413,31 @@ def getsitepackages(prefixes=None):
abi_thread = 't'
else:
abi_thread = ''
@@ -568,7 +568,7 @@ index 5c38b1b..f0f5ba5 100644
if sys.platlibdir != "lib":
libdirs.append("lib")
diff --git a/Lib/sysconfig/__init__.py b/Lib/sysconfig/__init__.py
index dad715e..c573614 100644
index f93b98d..8744f83 100644
--- a/Lib/sysconfig/__init__.py
+++ b/Lib/sysconfig/__init__.py
@@ -48,6 +48,36 @@ _INSTALL_SCHEMES = {
@@ -685,7 +685,7 @@ index dad715e..c573614 100644
return {
'prefix': 'nt',
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 53e5538..36c9cfb 100644
index d30f69d..a3ec6fd 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -388,9 +388,10 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin):
@@ -705,7 +705,7 @@ index 53e5538..36c9cfb 100644
2.48.1
From 3b782c4a49c7c3338f726ad8eee0425f673e8ef7 Mon Sep 17 00:00:00 2001
From e5265681fd7ff4714c07be9aa07b0cb1b6be1917 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Mon, 12 Feb 2024 08:39:38 -0300
Subject: Fix location of REPL's history file.
@@ -716,10 +716,10 @@ Content-Transfer-Encoding: 8bit
Adapted from previous patches by Jérôme Duval.
diff --git a/Lib/site.py b/Lib/site.py
index f0f5ba5..eeb34ea 100644
index c1fe2a4..c304121 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -511,8 +511,18 @@ def gethistoryfile():
@@ -512,8 +512,18 @@ def gethistoryfile():
history = os.environ.get("PYTHON_HISTORY")
if history:
return history
@@ -744,7 +744,7 @@ index f0f5ba5..eeb34ea 100644
2.48.1
From 5a3089a0bcb8a2ed6b3989408cec4e873768bd24 Mon Sep 17 00:00:00 2001
From cf84571b89864597f8b46e306bea830471471ecb Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 10 Dec 2023 19:50:22 -0300
Subject: Miscellaneous "Lib/test/" fixes for Haiku.
@@ -755,10 +755,10 @@ Content-Transfer-Encoding: 8bit
test_fileio.py fix from "initial Haiku patch" by Jérôme Duval.
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index 55844ec..61aeb3f 100644
index 1b55125..0d7e135 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -6403,6 +6403,9 @@ def pairs(iterable):
@@ -6406,6 +6406,9 @@ def pairs(iterable):
class ZoneInfo(tzinfo):
zoneroot = '/usr/share/zoneinfo'
@@ -784,7 +784,7 @@ index 5a0f033..8e85ed4 100644
2.48.1
From 5caefb7d87991d2bed2634d40e0290761c05ec84 Mon Sep 17 00:00:00 2001
From 023a5988d67d158544c0800e96be4bee95fc0f0e Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Mon, 12 Feb 2024 10:50:34 -0300
Subject: Fix build on nightlies, following the addition of kqueue.
@@ -850,7 +850,7 @@ index d234d50..6e16247 100644
2.48.1
From b9850a06fd2082ac4b4212cc2131adb06994e791 Mon Sep 17 00:00:00 2001
From 94bf86cc84d74d766b49cd8a877661f34c84a8e7 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 9 Aug 2024 13:38:28 -0300
Subject: fix test_utf8_mode.
@@ -873,7 +873,7 @@ index f668810..a55a8e4 100644
2.48.1
From 7740a4ede72b77dfb3cf9876afc8f95f822269a3 Mon Sep 17 00:00:00 2001
From 6ee10c42ce61caaf0154a8c2b8db473695b65714 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 9 Aug 2024 14:35:04 -0300
Subject: Fix test_site.
@@ -891,10 +891,10 @@ Lib/site.py changes should eventually be merged with previous commits.
Leaving the changes here now for easier review.
diff --git a/Lib/site.py b/Lib/site.py
index eeb34ea..435a4ac 100644
index c304121..4cf045e 100644
--- a/Lib/site.py
+++ b/Lib/site.py
@@ -313,12 +313,8 @@ def _getuserbase():
@@ -314,12 +314,8 @@ def _getuserbase():
"%d.%d" % sys.version_info[:2])
if sys.platform.startswith('haiku'):
@@ -909,7 +909,7 @@ index eeb34ea..435a4ac 100644
return joinuser("~", ".local")
@@ -424,18 +420,10 @@ def getsitepackages(prefixes=None):
@@ -425,18 +421,10 @@ def getsitepackages(prefixes=None):
# For .hpkg installed under ~/config/ (pkgman install -H)
# ("pip install --user" uses ~/config/non-packaged/, and gets
# handled by the "haiku_user" install scheme.
@@ -933,10 +933,10 @@ index eeb34ea..435a4ac 100644
libdirs = [sys.platlibdir]
if sys.platlibdir != "lib":
diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py
index a7e9241..03a6bd9 100644
index d0e3294..1452e42 100644
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -324,7 +324,21 @@ class HelperFunctionsTests(unittest.TestCase):
@@ -323,7 +323,21 @@ class HelperFunctionsTests(unittest.TestCase):
def test_getsitepackages(self):
site.PREFIXES = ['xoxo']
dirs = site.getsitepackages()
@@ -963,14 +963,14 @@ index a7e9241..03a6bd9 100644
2.48.1
From c7afe1a34fe5ca23d50e9591d55d4fade1f66f0d Mon Sep 17 00:00:00 2001
From 66b231f7fb17cf4e094809351e2ab4fd6db8f1b5 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Fri, 9 Aug 2024 15:37:13 -0300
Subject: Fix test_sysconfig.
diff --git a/Lib/test/test_sysconfig.py b/Lib/test/test_sysconfig.py
index 36c9cfb..25dccd0 100644
index a3ec6fd..c6d5ef9 100644
--- a/Lib/test/test_sysconfig.py
+++ b/Lib/test/test_sysconfig.py
@@ -223,6 +223,19 @@ class TestSysConfig(unittest.TestCase, VirtualEnvironmentMixin):
@@ -1006,7 +1006,7 @@ index 36c9cfb..25dccd0 100644
2.48.1
From f63dede5e9a8f49a7e2f79b5958014869ce421f5 Mon Sep 17 00:00:00 2001
From 2d79590c8698dfc0fd5c672a6bc9381db4a1c640 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sun, 29 Sep 2024 03:01:27 -0300
Subject: Partially fix test_compileall by skipping tests that need hardlink
@@ -1027,7 +1027,7 @@ index 2c45fe2..b63467b 100644
diff --git a/Lib/test/test_compileall.py b/Lib/test/test_compileall.py
index a580a24..d2e7ad1 100644
index 8384c18..d7e19ec 100644
--- a/Lib/test/test_compileall.py
+++ b/Lib/test/test_compileall.py
@@ -947,6 +947,7 @@ class CommandLineTestsBase:
@@ -1042,7 +1042,7 @@ index a580a24..d2e7ad1 100644
2.48.1
From b238dc5f2ccd0daafefc9c14a689eca2b9b7caa6 Mon Sep 17 00:00:00 2001
From b723491cb1d524f37953099facba6cb9f60f69e1 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Thu, 9 May 2024 15:16:26 -0300
Subject: Fix 3.13.0 build.
@@ -1055,7 +1055,7 @@ Previous Python versions had both the time out and the "|| true".
Some of the test run in that PGO stage sadly still fail on Haiku.
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 87b9c15..18581fb 100644
index f7dfa7a..6583bf3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -856,7 +856,7 @@ profile-run-stamp:
@@ -1067,7 +1067,7 @@ index 87b9c15..18581fb 100644
$(LLVM_PROF_MERGER)
# Remove profile generation binary since we are done with it.
$(MAKE) clean-retain-profile
@@ -2221,7 +2221,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS)
@@ -2227,7 +2227,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS)
TESTOPTS= $(EXTRATESTOPTS)
TESTPYTHON= $(RUNSHARED) $(PYTHON_FOR_BUILD) $(TESTPYTHONOPTS)
TESTRUNNER= $(TESTPYTHON) -m test
@@ -1093,14 +1093,14 @@ index 1598eba..88b94b6 100644
2.48.1
From 466f056fe263ac8d5e23e6cf7f0155b52526d810 Mon Sep 17 00:00:00 2001
From c69cb228cb2b98d5d8929c4df3f1dae7f0831de6 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Sat, 5 Oct 2024 07:32:17 -0300
Subject: Avoid forcing "-g" on LTO builds, unless Py_DEBUG is defined.
diff --git a/configure.ac b/configure.ac
index 2579824..971ab7d 100644
index 8d2e08b..eaf419d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2017,7 +2017,9 @@ if test "$Py_LTO" = 'true' ; then
@@ -1118,14 +1118,14 @@ index 2579824..971ab7d 100644
2.48.1
From 26fc298d259487f52d11ead852ecf635afd15883 Mon Sep 17 00:00:00 2001
From d474cd60f0195eb72653c466a3e88b2326100755 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Thu, 13 Feb 2025 13:30:03 -0300
Subject: Make sure we use 'spawn' on Haiku and not 'forkserver'.
diff --git a/Lib/multiprocessing/context.py b/Lib/multiprocessing/context.py
index d0a3ad0..5c69f5f 100644
index 051d567..4f20b24 100644
--- a/Lib/multiprocessing/context.py
+++ b/Lib/multiprocessing/context.py
@@ -322,7 +322,7 @@ if sys.platform != 'win32':

10
dev-lang/python/python3.14-3.14.0~b1.recipe → dev-lang/python/python3.14-3.14.0~b2.recipe
View File

@@ -19,13 +19,13 @@ HOMEPAGE="https://www.python.org"
LICENSE="Python"
COPYRIGHT="1990-2025 Python Software Foundation"
REVISION="1"
SOURCE_URI="https://www.python.org/ftp/python/${portVersion%~b1}/Python-${portVersion/'~'/}.tar.xz"
CHECKSUM_SHA256="2ddd30a77c9f62e065ce648664a254b9b0c011bcdaa8c1c2787087e644cbeb39"
SOURCE_URI="https://www.python.org/ftp/python/${portVersion%~b2}/Python-${portVersion/'~'/}.tar.xz"
CHECKSUM_SHA256="7ac9e84844bbc0a5a8f1f79a37a68b3b8caf2a58b4aa5999c49227cb36e70ea6"
SOURCE_DIR="Python-${portVersion/'~'/}"
pyShortVer="${portVersion%~b1}"
pyShortVer="${portVersion%~b2}"
pyShortVer="${pyShortVer%.*}"
pyVersionCompat="${portVersion%~b1} compat >= $pyShortVer"
pyVersionCompat="${portVersion%~b2} compat >= $pyShortVer"
PATCHES="python$pyShortVer-$portVersion.patchset"
@@ -62,7 +62,7 @@ packageTests=false
optimizedBuild=true
# Generally, we disable parallel builds if "optimizedBuild == true" as they can fail.
forceParallelBuild=true
forceParallelBuild=false
# Run all tests by default. Set to "true" to make "hp --test" only run then known failing tests.
runOnlyKnownFailingTests=false