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

python: Stricter [gs]et_rlimit mode detection

Browse Source 
There doesn't seem to be a better way, else than configure runtime checks,
which is harmful for cross-compilation.
This commit is contained in:
Timothy Gu
2015-01-11 18:43:34 -08:00
parent b33f96fa88
commit 060f83d1a9
2 changed files with 86 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
dev-lang/python/patches/python-2.7.9.patchset
View File

@@ -1,4 +1,4 @@
From ca78f3e4c26f1d94def56bd1a5fec519d2b0579c Mon Sep 17 00:00:00 2001
From 87c88af3eef31c978cecf0d96665af0c4109d7e5 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 12 Mar 2014 21:17:06 +0000
Subject: initial Haiku patch
@@ -759,7 +759,7 @@ index 7868b7b..bc4a1a4 100644
1.8.3.4
From af64f0fbd90f24886cac80f79f3db0da46ede0e5 Mon Sep 17 00:00:00 2001
From 6347fda5298f9aa5eca939541924464fcf8a19d1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 5 Apr 2014 21:16:40 +0000
Subject: fix pyconfig.h path
@@ -782,7 +782,7 @@ index 7f4ec2f..25a93e5 100644
1.8.3.4
From fa99392d5c5df974b86ff319148514644731d192 Mon Sep 17 00:00:00 2001
From 5e90b750c4bfef1376bb083d48524c41fc5fefa6 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 18 Jun 2014 12:19:13 +0000
Subject: Import missed change from the 2.6.9 patches
@@ -814,7 +814,7 @@ index d2e18f1..34d5aee 100644
1.8.3.4
From c2e1dc174241f7beedf43ee5bef3c76e0600e069 Mon Sep 17 00:00:00 2001
From 307d21aa5ea6336db7ec3dd9429436441b61ab8d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 21 Sep 2014 18:59:44 +0200
Subject: gcc2 fix.
@@ -837,7 +837,7 @@ index 37f5a9e..37b0b25 100644
1.8.3.4
From a0bdbb8e92894e1de5a453ca08659d68e75b67d1 Mon Sep 17 00:00:00 2001
From b1aabdb8e27c669873ec393344389aa343a6aeab Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 28 Nov 2014 16:26:28 +0000
Subject: tarfile: let link fail and catch exception.
@@ -869,7 +869,7 @@ index b0d1292..b5952ae 100644
1.8.3.4
From 77217bde28ee863a42421f87692d986a8f784896 Mon Sep 17 00:00:00 2001
From 5398326cd9e24ca71a025f48ea0079b8d40456ec Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 11 Jan 2015 18:18:22 -0800
Subject: Fix resource module after the initial haiku patch
@@ -904,3 +904,82 @@ index 6c5f52f..73758bb 100644
--
1.8.3.4
From 6d7958a9371618a6b7a53f8de6b71633be2af7c3 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 11 Jan 2015 18:40:43 -0800
Subject: resource: Fix [gs]et_rlimit() modes detection
Haiku defines many of them, but they are actually empty stubs that will always
return EINVAL. No better way of doing this.
diff --git a/Modules/resource.c b/Modules/resource.c
index 73758bb..0c396f6 100644
--- a/Modules/resource.c
+++ b/Modules/resource.c
@@ -284,19 +284,19 @@ initresource(void)
(PyObject*) &StructRUsageType);
/* insert constants */
-#ifdef RLIMIT_CPU
+#if !defined(__HAIKU__) && defined(RLIMIT_CPU)
PyModule_AddIntConstant(m, "RLIMIT_CPU", RLIMIT_CPU);
#endif
-#ifdef RLIMIT_FSIZE
+#if !defined(__HAIKU__) && defined(RLIMIT_FSIZE)
PyModule_AddIntConstant(m, "RLIMIT_FSIZE", RLIMIT_FSIZE);
#endif
-#ifdef RLIMIT_DATA
+#if !defined(__HAIKU__) && defined(RLIMIT_DATA)
PyModule_AddIntConstant(m, "RLIMIT_DATA", RLIMIT_DATA);
#endif
-#ifdef RLIMIT_STACK
+#if !defined(__HAIKU__) && defined(RLIMIT_STACK)
PyModule_AddIntConstant(m, "RLIMIT_STACK", RLIMIT_STACK);
#endif
@@ -308,31 +308,31 @@ initresource(void)
PyModule_AddIntConstant(m, "RLIMIT_NOFILE", RLIMIT_NOFILE);
#endif
-#ifdef RLIMIT_OFILE
+#if !defined(__HAIKU__) && defined(RLIMIT_OFILE)
PyModule_AddIntConstant(m, "RLIMIT_OFILE", RLIMIT_OFILE);
#endif
-#ifdef RLIMIT_VMEM
+#if !defined(__HAIKU__) && defined(RLIMIT_VMEM)
PyModule_AddIntConstant(m, "RLIMIT_VMEM", RLIMIT_VMEM);
#endif
-#ifdef RLIMIT_AS
+#if !defined(__HAIKU__) && defined(RLIMIT_AS)
PyModule_AddIntConstant(m, "RLIMIT_AS", RLIMIT_AS);
#endif
-#ifdef RLIMIT_RSS
+#if !defined(__HAIKU__) && defined(RLIMIT_RSS)
PyModule_AddIntConstant(m, "RLIMIT_RSS", RLIMIT_RSS);
#endif
-#ifdef RLIMIT_NPROC
+#if !defined(__HAIKU__) && defined(RLIMIT_NPROC)
PyModule_AddIntConstant(m, "RLIMIT_NPROC", RLIMIT_NPROC);
#endif
-#ifdef RLIMIT_MEMLOCK
+#if !defined(__HAIKU__) && defined(RLIMIT_MEMLOCK)
PyModule_AddIntConstant(m, "RLIMIT_MEMLOCK", RLIMIT_MEMLOCK);
#endif
-#ifdef RLIMIT_SBSIZE
+#if !defined(__HAIKU__) && defined(RLIMIT_SBSIZE)
PyModule_AddIntConstant(m, "RLIMIT_SBSIZE", RLIMIT_SBSIZE);
#endif
--
1.8.3.4