From c4b75834ec2af95a3a94bfb7e7836d34a34cab0b Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Fri, 8 Feb 2013 18:23:05 +0100
Subject: use system sqlite not a private copy

---
 package/firefox/Makefile                | 1 -
 package/firefox/patches/patch-configure | 9 ---------
 package/nss/Makefile                    | 7 ++++---
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index ad8dc3a19..6c021f3e0 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -80,7 +80,6 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--disable-jemalloc \
 			--disable-crashreporter \
 			--disable-updater \
-			--disable-dtrace \
 			--disable-libjpeg-turbo \
 			--disable-elf-hack
 
diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure
index 6fe7c4533..133d0fdee 100644
--- a/package/firefox/patches/patch-configure
+++ b/package/firefox/patches/patch-configure
@@ -1,14 +1,5 @@
 --- mozilla-release.orig/configure	2011-07-08 03:30:27.000000000 +0200
 +++ mozilla-release/configure	2013-02-07 16:38:49.000000000 +0100
-@@ -10022,7 +10022,7 @@ cross_compiling=$ac_cv_prog_cc_cross
- # Check whether --enable-dtrace or --disable-dtrace was given.
- if test "${enable_dtrace+set}" = set; then
-   enableval="$enable_dtrace"
--  enable_dtrace="yes"
-+  enable_dtrace="no"
- fi
- 
- if test "x$enable_dtrace" = "xyes"; then
 @@ -23504,6 +23504,9 @@ fi
      fi
  fi
diff --git a/package/nss/Makefile b/package/nss/Makefile
index d3fd62b08..fe448f6df 100644
--- a/package/nss/Makefile
+++ b/package/nss/Makefile
@@ -12,8 +12,8 @@ PKG_PATCH_VERSION:=	1
 PKG_MD5SUM:=		f6f3a942d1eba3e26aa0382a5b5461d9
 PKG_DESCR:=		Network Security Services (NSS) library
 PKG_SECTION:=		libs
-PKG_BUILDDEP:=		nspr zlib
-PKG_DEPENDS:=		nspr
+PKG_BUILDDEP:=		nspr zlib sqlite
+PKG_DEPENDS:=		nspr zlib libsqlite
 PKG_URL:=		http://www.mozilla.org/projects/security/pki/nss/
 PKG_SITES:=		ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_${PKG_MAJ_VERSION}_${PKG_MIN_VERSION}_${PKG_PATCH_VERSION}_RTM/src/
 PKG_NOPARALLEL:=	1
@@ -44,7 +44,8 @@ TARGET_LDFLAGS+=	-ldl -pthread -lrt
 XAKE_FLAGS+=		SOURCE_MD_DIR=${WRKDIST}/dist DIST=${WRKDIST}/dist
 XAKE_FLAGS+=		ARCHFLAG="${TARGET_CFLAGS} ${TARGET_CPPFLAGS} ${TARGET_LDFLAGS}"
 XAKE_FLAGS+=		NSS_DISABLE_DBM=1 OS_TEST=${CPU_ARCH} OS_TARGET=Linux OS_RELEASE=2.6 OS_ARCH=Linux
-XAKE_FLAGS+=		ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib"
+XAKE_FLAGS+=		ARTOOL="${TARGET_CROSS}ar" RANLIB="${TARGET_CROSS}ranlib" NSS_USE_SYSTEM_SQLITE=1
+XAKE_FLAGS+=		NSS_USE_SYSTEM_ZLIB=1
 ALL_TARGET:=		build_coreconf all
 
 post-install:
-- 
cgit v1.2.3