added patch-python26

2026-06-05 23:30:18 +00:00 · 2011-05-02 17:30:59 +09:00
parent 3bc8c36aaa
commit 20027a4a36
19 changed files with 221 additions and 83 deletions
@@ -0,0 +1,2 @@
+g/defined(__APPLE__)/s//0/g
+w
@@ -0,0 +1,2 @@
+g/'darwin', /s///
+w
@@ -1,11 +0,0 @@
--- Mac/Modules/file/_Filemodule.c.orig	2009-09-12 15:55:59.000000000 +1000
-+++ Mac/Modules/file/_Filemodule.c	2009-09-12 16:12:07.000000000 +1000
-@@ -7,6 +7,8 @@
- 
- #include "pymactoolbox.h"
- 
-+typedef SInt16	FSIORefNum;
-+
- /* Macro to test whether a weak-loaded CFM function exists */
- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL )  {\
-         PyErr_SetString(PyExc_NotImplementedError, \
@@ -1,16 +0,0 @@
--- Misc/setuid-prog.c.orig	Sat Dec 11 14:29:22 2004
-+++ Misc/setuid-prog.c	Sat Dec 11 14:30:13 2004
-@@ -70,6 +70,12 @@
- #define environ _environ
- #endif
- 
-+#if defined(__APPLE__)
-+#include <sys/time.h>
-+#include <crt_externs.h>
-+#define environ (*_NSGetEnviron())
-+#endif
-+
- /* don't change def_IFS */
- char def_IFS[] = "IFS= \t\n";
- /* you may want to change def_PATH, but you should really change it in */
-
@@ -1,21 +0,0 @@
--- Modules/posixmodule.c.orig	Sat Dec 11 14:27:52 2004
-+++ Modules/posixmodule.c	Sat Dec 11 14:28:17 2004
-@@ -339,7 +339,7 @@
- #endif
- 
- /* Return a dictionary corresponding to the POSIX environment table */
-#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- /* On Darwin/MacOSX a shared library or framework has no access to
- ** environ directly, we must obtain it with _NSGetEnviron().
- */
-@@ -357,7 +357,7 @@
- 	d = PyDict_New();
- 	if (d == NULL)
- 		return NULL;
-#ifdef WITH_NEXT_FRAMEWORK
-+#ifdef __APPLE__
- 	if (environ == NULL)
- 		environ = *_NSGetEnviron();
- #endif
-
@@ -1,28 +0,0 @@
--- configure.in.orig	2007-09-28 21:07:32.000000000 +0200
-+++ configure.in	2007-09-28 21:08:12.000000000 +0200
-@@ -669,6 +669,11 @@
- 	  BLDLIBRARY='-L. -lpython$(VERSION)'
- 	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- 	  ;;
-+	Darwin*)
-+	  LDLIBRARY='libpython$(VERSION).dylib'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
-+	  ;;
-   esac
- else # shared is disabled
-   case $ac_sys_system in
--- configure.orig	2007-09-28 21:07:26.000000000 +0200
-+++ configure	2007-09-28 21:07:33.000000000 +0200
-@@ -3445,6 +3445,11 @@
- 	  BLDLIBRARY='-L. -lpython$(VERSION)'
- 	  RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
- 	  ;;
-+	Darwin*)
-+	  LDLIBRARY='libpython$(VERSION).dylib'
-+	  BLDLIBRARY='-L. -lpython$(VERSION)'
-+	  RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
-+	  ;;
-   esac
- else # shared is disabled
-   case $ac_sys_system in