[Minios-devel] [UNIKRAFT/PYTHON3 PATCH v2 02/13] patches: Fix build issues

[Costin Lupu <costin.lupu@xxxxxxxxx>]

From: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>

* Undefine HAVE_FORK and HAVE_EXECV
* Fix cast for pthread_t

Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
---
 ...1-Undefine-HAVE_FORK-and-HAVE_EXECVE.patch | 26 ++++++++++++++++
 patches/0002-Add-cast-for-pthread_t.patch     | 30 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 patches/0001-Undefine-HAVE_FORK-and-HAVE_EXECVE.patch
 create mode 100644 patches/0002-Add-cast-for-pthread_t.patch

diff --git a/patches/0001-Undefine-HAVE_FORK-and-HAVE_EXECVE.patch 
b/patches/0001-Undefine-HAVE_FORK-and-HAVE_EXECVE.patch
new file mode 100644
index 0000000..84a494f
--- /dev/null
+++ b/patches/0001-Undefine-HAVE_FORK-and-HAVE_EXECVE.patch
@@ -0,0 +1,26 @@
+From 47e57bc46cab3c92f4137bf183534d593ebea211 Mon Sep 17 00:00:00 2001
+From: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
+Date: Mon, 2 Sep 2019 04:23:30 +0300
+Subject: [PATCH 1/1] Undefine HAVE_FORK and HAVE_EXECVE
+
+Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
+---
+ Modules/posixmodule.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
+index b758e76..aed9e22 100644
+--- a/Modules/posixmodule.c
++++ b/Modules/posixmodule.c
+@@ -175,8 +175,6 @@ corresponding Unix manual entries for more information on 
calls.");
+ #define fsync _commit
+ #else
+ /* Unix functions that the configure script doesn't check for */
+-#define HAVE_EXECV      1
+-#define HAVE_FORK       1
+ #if defined(__USLC__) && defined(__SCO_VERSION__)       /* SCO UDK Compiler */
+ #define HAVE_FORK1      1
+ #endif
+-- 
+2.20.1
+
diff --git a/patches/0002-Add-cast-for-pthread_t.patch 
b/patches/0002-Add-cast-for-pthread_t.patch
new file mode 100644
index 0000000..817ac15
--- /dev/null
+++ b/patches/0002-Add-cast-for-pthread_t.patch
@@ -0,0 +1,30 @@
+From 710f3978a9a10690882f28757d3f4a95c17f4f6a Mon Sep 17 00:00:00 2001
+From: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
+Date: Mon, 2 Sep 2019 04:27:46 +0300
+Subject: [PATCH 1/1] Add cast for pthread_t
+
+Signed-off-by: Vlad-Andrei Badoiu <vlad_andrei.badoiu@xxxxxxxxxxxxxxx>
+---
+ Python/thread_pthread.h | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Python/thread_pthread.h b/Python/thread_pthread.h
+index f79f9b9..cbf114a 100644
+--- a/Python/thread_pthread.h
++++ b/Python/thread_pthread.h
+@@ -258,7 +258,12 @@ PyThread_get_thread_ident(void)
+     if (!initialized)
+         PyThread_init_thread();
+     threadid = pthread_self();
++
++#if SIZEOF_PTHREAD_T <= SIZEOF_LONG
+     return (unsigned long) threadid;
++#else
++    return (unsigned long) *(unsigned long *) &threadid;
++#endif
+ }
+ 
+ void
+-- 
+2.20.1
+
-- 
2.20.1


_______________________________________________
Minios-devel mailing list
Minios-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/minios-devel