ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Make PyUNO work --with-macox-version-min-required=10.6

Browse Source 
...by using system libsqlite3.dylib instead of nss one (see comment in
nss/makefile.mk for details).

(dmake knows neither < nor ! in conditional expressions, that is the reason for
the strange .IF .ELSE ... .END constructs.)

Change-Id: I5abe0f74ad55aac06b91163751bb8145b759b9ca
This commit is contained in:
Stephan Bergmann
2012-06-12 13:48:38 +02:00
parent 0f79440a86
commit dc82cf021f
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
moz/extractfiles.mk
+6 -1
View File
@@ -63,9 +63,14 @@ NSS_MODULE_RUNTIME_LIST:= \
plds4 \
smime3 \
softokn3 \
sqlite/sqlite3 \
ssl3
# For Mac OS X >= 10.6 the system lib is used instead (see nss/makefile.mk):
.IF "$(OS)" == "MACOSX" && "$(MAC_OS_X_VERSION_MIN_REQUIRED)" >= "1060"
.ELSE
NSS_MODULE_RUNTIME_LIST += sqlite/sqlite3
.END
BIN_RUNTIMELIST= \
xpcom \
xpcom_core \
moz/zipped/makefile.mk
+8 -4
View File
@@ -170,9 +170,6 @@ FREEBL=freebl3
FREEBL=freebl3
.ENDIF # "$(OS)" == "SOLARIS"
#On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so
#See readme.txt in module nss
NSS_MODULE_RUNTIME_LIST:= \
$(FREEBL) \
nspr4 \
@@ -184,9 +181,16 @@ NSS_MODULE_RUNTIME_LIST:= \
plds4 \
smime3 \
softokn3 \
sqlite/sqlite3 \
ssl3
# On Linux/Unix sqlite is delivered to $(SOLARLIBDIR)/sqlite/libsqlite3.so (see
# nss/README) and for Mac OS X >= 10.6 the system lib is used instead (see
# nss/makefile.mk):
.IF "$(OS)" == "MACOSX" && "$(MAC_OS_X_VERSION_MIN_REQUIRED)" >= "1060"
.ELSE
NSS_MODULE_RUNTIME_LIST += sqlite/sqlite3
.END
# Remove the nss libs build in moz and those build in the nss module
$(MISC)$/replace_old_nss_libs : $(MISC)$/unpacked_$(TARGET)_lib \
$(MISC)$/unpacked_$(TARGET)_inc $(BIN)$/mozruntime.zip
nss/makefile.mk
+12
View File
@@ -106,6 +106,18 @@ BUILD_ACTION+=FREEBL_NO_DEPEND=1
BUILD_ACTION+=NS_USE_GCC=1
.ENDIF
# Otherwise, LibreOffice.app/Contents/MacOS/python -c 'import uno' fails to
# dlopen LibreOffice.app/Contents/MacOS/libpyuno.dylib (at
# pyuno/source/module/pyuno_dlopenwrapper.c:73) with dlerror "Symbol not found:
# _sqlite3_wal_checkpoint; Referenced from: /System/Library/Frameworks/
# CoreServices.framework/Versions/A/Frameworks/CFNetwork.framework/Versions/A/
# CFNetwork; Expected in: [...]/LibreOffice.app/Contents/MacOS/libsqlite3.dylib;
# in /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/
# CFNetwork.framework/Versions/A/CFNetwork":
.IF "$(OS)" == "MACOSX" && "$(MAC_OS_X_VERSION_MIN_REQUIRED)" >= "1060"
BUILD_ACTION += NSS_USE_SYSTEM_SQLITE=1
.END
.ENDIF # "$(GUI)"=="UNX"