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

python3.14: adjust MACHDEP as was done for the other versions. (#13929)

Browse Source 
One user-visible change from this is that `sys.platform` returns just "haiku" now,
instead of "haiku1" as on beta5. Also visible on the REPL initial message.

Without this change, I was getting (on nightlies): 'haikuR1~beta5+development'.

Using just "haiku" make is more in-line with what is done for other platforms
(linux, freebsd, darwin, etc).

ToDo: clean up the rest of the patchset, where we previously had to use:

`if sys.platform.startswith("haiku")` or `if sys.platform[:5] == "haiku"`.
This commit is contained in:
OscarL
2026-04-08 04:10:11 -03:00
committed by GitHub
parent de49c1d102
commit bccf5d8088
2 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
dev-lang/python/patches/python3.14-3.14.4.patchset
View File

@@ -1,4 +1,4 @@
From 364efe7bf56e5785c4c4c7b16085e85dc0d3fa3f Mon Sep 17 00:00:00 2001
From 371787c5869c744ddef0a0db6e04477cb633c7b3 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
@@ -197,7 +197,7 @@ index 1acb91f..0e39861 100644
2.52.0
From 7438c32d2ee126ce4bcb7a20e9df155af41b090e Mon Sep 17 00:00:00 2001
From 05a8f863e2e8ac2eec063390fa7897f4e7577730 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 e0a9531..1d76b4f 100644
2.52.0
From 2f8e45ffc2ac459212762e29852be6544ecc2727 Mon Sep 17 00:00:00 2001
From 4d3bf15d0f6bf2d2dfdedd81ddb88e0b799ff0d3 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 3b21658..8c8ce7f 100644
2.52.0
From 0ddd6f9511940629fa9b5e4b5260224a27502c9f Mon Sep 17 00:00:00 2001
From 441cfdf2bab3788cdbf73afe10b16ce097c9d55a 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,7 +359,7 @@ index 0e0b503..b79a3f7 100644
2.52.0
From 0d326943ba0c5dcc247b61c485af74feacacec04 Mon Sep 17 00:00:00 2001
From 7af12d6c3a0ee690b88774588ba7451b9fadb9bd 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.
@@ -382,7 +382,7 @@ index 9005f1e..28708e2 100644
2.52.0
From f249dcee55206e543f1630b9b4c9889a5df6ef55 Mon Sep 17 00:00:00 2001
From c4ccfeae803784afab2105e9630c9b31acc858bd 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
@@ -412,7 +412,7 @@ index 31b2d28..a818818 100644
2.52.0
From 29514313a3dcec5384fc718275dd1bfab6499be5 Mon Sep 17 00:00:00 2001
From 45b62202a7df91bd46d59eae1df3d69b875203d9 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.
@@ -465,7 +465,7 @@ index f468dda..4ab9157 100644
2.52.0
From c4ca9be2daf449948b4dff32d469bf860a144064 Mon Sep 17 00:00:00 2001
From ce3fe61b2e5080e2fd9d0412858ba00f94e472b0 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.
@@ -681,7 +681,7 @@ index 1fe4b68..cbe540a 100644
2.52.0
From a6168814c87c0f694ef447869003e7c85275e8aa Mon Sep 17 00:00:00 2001
From fb171a3c91ad437866f48523200842ddd0a04c71 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.
@@ -720,7 +720,7 @@ index e6351bb..ef75d2b 100644
2.52.0
From 5f0e1d035e5756315011a75387a7b0a79125ce72 Mon Sep 17 00:00:00 2001
From b6157754581f03787b9e5c44f1b1da7cbb436787 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.
@@ -760,7 +760,7 @@ index e3d54f6..efb4d03 100644
2.52.0
From 884cd8a3096fba990716646d98f765c3ab3f5df5 Mon Sep 17 00:00:00 2001
From e54499ad6a796e75172cd640a578c6a44777e3ef 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.
@@ -826,7 +826,7 @@ index d234d50..6e16247 100644
2.52.0
From bf3efec54e0943343d3ebf9fc8b3bd9aab24f7c0 Mon Sep 17 00:00:00 2001
From e8aac93e7ecfb3ded1b3bf0c49a876abe1940e55 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.
@@ -849,7 +849,7 @@ index f668810..a55a8e4 100644
2.52.0
From 001373d3062fea8e4e38650a667d7c4fbdc01092 Mon Sep 17 00:00:00 2001
From 4fae040695dbeb1d38fa3bc91bf9b01e438e0864 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.
@@ -939,7 +939,7 @@ index f8c6f37..2cf711f 100644
2.52.0
From bce98aeeca6e13626f842cac9d41448b6e6a0a31 Mon Sep 17 00:00:00 2001
From 713fe7963e2aa659bfd9b6f134258292db6e57d4 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.
@@ -982,7 +982,7 @@ index cbe540a..7eab1a7 100644
2.52.0
From ac6d283c50f3fdf27d0c8e045f5aa7f3c5d76ef6 Mon Sep 17 00:00:00 2001
From caf0ca88f2811f306fa1247da05a737f3013c247 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
@@ -1018,7 +1018,7 @@ index 8384c18..d7e19ec 100644
2.52.0
From 246dc0242d9f3fa591a1a0e81882003a9b105e72 Mon Sep 17 00:00:00 2001
From 4edee51c16c10a9a5a895082362d6b78f0f29f98 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.
@@ -1069,7 +1069,7 @@ index 1598eba..88b94b6 100644
2.52.0
From d86c2426c59fd41320acd4b0e73694a3b12f5bfe Mon Sep 17 00:00:00 2001
From 7184a9870dff7b7bfc572827be82da48dd0340a6 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.
@@ -1094,7 +1094,7 @@ index 0e39861..e573e9d 100644
2.52.0
From ab7a7ca7d43c0b690f795540956ee1cb175b0dab Mon Sep 17 00:00:00 2001
From 3ff5b627c65af777e75577adfbb997166e4c5fb9 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'.
@@ -1117,7 +1117,7 @@ index 5fa6d7e..1b77bfe 100644
2.52.0
From fa9b0b374d82382a21323036503c7cfb284b03f4 Mon Sep 17 00:00:00 2001
From 9c01caa561e87c14bf92ae1bb4d47faeee46c66a Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Tue, 7 Apr 2026 18:01:51 -0300
Subject: test/support: add is_haiku boolean...
@@ -1164,3 +1164,35 @@ index 6635ec3..22849e3 100644
--
2.52.0
From 3d6b1e9a6e4ca608c76e580f1eadf315221b0963 Mon Sep 17 00:00:00 2001
From: Oscar Lesta <oscar.lesta@gmail.com>
Date: Tue, 7 Apr 2026 20:11:31 -0300
Subject: configure.ac: add Haiku to the MACHDEP cases.
diff --git a/configure.ac b/configure.ac
index e573e9d..1755ed0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -333,6 +333,9 @@ then
*-*-darwin*)
ac_sys_system=Darwin
;;
+ *-*-haiku*)
+ ac_sys_system=Haiku
+ ;;
*-*-vxworks*)
ac_sys_system=VxWorks
;;
@@ -370,6 +373,7 @@ then
linux*) MACHDEP="linux";;
cygwin*) MACHDEP="cygwin";;
darwin*) MACHDEP="darwin";;
+ haiku*) MACHDEP="haiku";;
'') MACHDEP="unknown";;
esac
--
2.52.0