From dc82cf021f76ea83ff7a4bcb2d7525f2e111f0cc Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 12 Jun 2012 13:44:28 +0200
Subject: 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
---
 moz/extractfiles.mk    |  7 ++++++-
 moz/zipped/makefile.mk | 12 ++++++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'moz')

diff --git a/moz/extractfiles.mk b/moz/extractfiles.mk
index e4e40b8612ff..6035d5f4e2eb 100644
--- a/moz/extractfiles.mk
+++ b/moz/extractfiles.mk
@@ -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 \
diff --git a/moz/zipped/makefile.mk b/moz/zipped/makefile.mk
index 0f1fe2c503bd..a08561e1c86c 100644
--- a/moz/zipped/makefile.mk
+++ b/moz/zipped/makefile.mk
@@ -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
-- 
cgit