[Lunar-commits] <moonbase> nss: Resolve conflict with system sqlite

Stefan Wold ratler at lunar-linux.org
Wed Aug 13 21:30:57 CEST 2008


commit b0f8c07ae3270bf08a391cdd6d0453360cf4be29
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Wed Aug 13 21:30:57 2008 +0200

    nss: Resolve conflict with system sqlite
    
    * Added sqlite as a dependency
    * Force nss to use system sqlite instead of internal version
---
 libs/nss/BUILD   |    3 ++-
 libs/nss/DEPENDS |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/libs/nss/BUILD b/libs/nss/BUILD
index edb1cd1..2c24d68 100644
--- a/libs/nss/BUILD
+++ b/libs/nss/BUILD
@@ -1,6 +1,7 @@
 (
   export WORKINGDIR=$PWD  &&
   export BUILD_OPT=1      &&
+  export NSS_USE_SYSTEM_SQLITE=1 &&
 
   if [ "`arch`" == "x86_64" ]; then
     export USE_64=1
@@ -19,7 +20,7 @@
   install -v -m755 nsprpub/$NSS_LINUXDIR/config/nspr-config \
                    security/nss/cmd/config/nss-config \
                    /usr/bin &&
-  
+
   mkdir -p /usr/lib/pkgconfig &&
   install -v -m644 nsprpub/lib/pkgconfig/nspr.pc \
                    security/nss/lib/pkgconfig/nss.pc \
diff --git a/libs/nss/DEPENDS b/libs/nss/DEPENDS
new file mode 100644
index 0000000..1f6ab23
--- /dev/null
+++ b/libs/nss/DEPENDS
@@ -0,0 +1 @@
+depends sqlite


More information about the Lunar-commits mailing list