diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-2.6.1-dylib_dynload.patch | 14 | ||||
| -rw-r--r-- | python/makefile.mk | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/python/Python-2.6.1-dylib_dynload.patch b/python/Python-2.6.1-dylib_dynload.patch deleted file mode 100644 index 3e44502e389c..000000000000 --- a/python/Python-2.6.1-dylib_dynload.patch +++ /dev/null @@ -1,14 +0,0 @@ -add dylib to the extensions, to be able to load pyuno.dylib via "import pyuno" ---- misc/Python-2.6.1/Python/dynload_shlib.c 2006-01-04 02:30:17.000000000 +0100 -+++ misc/build/Python-2.6.1/Python/dynload_shlib.c 2011-06-11 19:42:09.000000000 +0200 -@@ -46,6 +46,10 @@ - {"module.exe", "rb", C_EXTENSION}, - {"MODULE.EXE", "rb", C_EXTENSION}, - #else -+#ifdef __APPLE__ -+ {".dylib", "rb", C_EXTENSION}, -+ {"module.dylib", "rb", C_EXTENSION}, -+#endif - {".so", "rb", C_EXTENSION}, - {"module.so", "rb", C_EXTENSION}, - #endif diff --git a/python/makefile.mk b/python/makefile.mk index 4f50ed3bcccf..be7fcbb125e8 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -90,7 +90,7 @@ CONFIGURE_ACTION += --disable-ipv6 .ENDIF .IF "$(OS)" == "MACOSX" -PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.patch +PATCH_FILES+=Python-2.6.1-py8067.patch # don't build dual-arch version as OOo itself is not universal binary either PATCH_FILES+=Python-2.6.1-arch_$(eq,$(CPU),I i386 ppc).patch |