Kaydet (Commit) f892f979 authored tarafından Christian Lohmaier's avatar Christian Lohmaier

add dylib to the list of native python modules for Mac (for pyuno.dylib)

üst adb55257
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
......@@ -88,7 +88,7 @@ CONFIGURE_ACTION += --disable-ipv6
.ENDIF
.IF "$(OS)" == "MACOSX"
PATCH_FILES+=Python-2.6.1-py8067.patch
PATCH_FILES+=Python-2.6.1-py8067.patch Python-2.6.1-dylib_dynload.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
......@@ -235,7 +235,6 @@ $(MISC)/OOoPython.framework.zip: $(PACKAGE_DIR)/fixinstallnames $(PACKAGE_DIR)/f
$(PYVERSIONFILE) : pyversion.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
@-rm -f $@
@echo process $@
$(COMMAND_ECHO)sed 's#%%replaceme%%#$(MYCWD)/python-inst#g' < pyversion.mk > $@
$(COMMAND_ECHO)$(COPY) pyversion.mk $@
.ENDIF # DISABLE_PYTHON != TRUE
......@@ -10,8 +10,6 @@ PYVERSION=$(PYMAJOR).$(PYMINOR).$(PYMICRO)
PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).a
PYTHONLIB=-F$(SOLARLIBDIR) -framework OOoPython
CFLAGS+=-I$(SOLARLIBDIR)/OOoPython.framework/Versions/$(PYMAJOR).$(PYMINOR)/include/python$(PYMAJOR).$(PYMINOR)
# needed to fix install_name in pyuno
PYTHON_MAKEINSTALLDIR=%%replaceme%%
.ELSE
PY_FULL_DLL_NAME=libpython$(PYMAJOR).$(PYMINOR).so.1.0
PYTHONLIB=-lpython$(PYMAJOR).$(PYMINOR)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment