diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-06-12 13:44:28 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-06-12 13:48:38 +0200 |
| commit | dc82cf021f76ea83ff7a4bcb2d7525f2e111f0cc (patch) | |
| tree | a1872bac5d530c276891c4ab11a85261c43f1d4f /nss | |
| parent | 0f79440a86dc788a38ef4b3be63bffd2cd396ddc (diff) | |
Make PyUNO work --with-macox-version-min-required=10.6
...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
Diffstat (limited to 'nss')
| -rw-r--r-- | nss/makefile.mk | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 4e8dd9de8464..433885786237 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -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" |