Revert "add dylib to the list of native python modules for Mac (for pyuno.dylib)"
This reverts those parts of commitf892f979ce
that add .dylib as an extension for native Python modules, which in turn was obsoleted by2ea723e8ce
"Revert 'Mac OS X uses .dylib and not .so for python modules.'" (and I verified on Mac OS X 10.6.8 that both LO's internal Pyton 2.6.1 and MacPort's python3.2 indeed import a pyuno.so just fine). There were additional modifications regarding pyversion stuff in the original commitf892f979ce
that appear unrelated and which I left intact.
This commit is contained in:
@@ -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
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user