diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-25 22:16:04 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-25 22:16:04 +0100 |
| commit | 857b7edec53dd81e24941472f8278dd1b7f78463 (patch) | |
| tree | 5863e86db0e1d443d874fc34318d7ff2e4aa6f0c /package/firefox | |
| parent | 5683c8576efcdb830683a8b26f576892de7dbfce (diff) | |
fix firefox build, update sqlite dependency
Diffstat (limited to 'package/firefox')
| -rw-r--r-- | package/firefox/Makefile | 9 | ||||
| -rw-r--r-- | package/firefox/patches/patch-configure | 11 |
2 files changed, 16 insertions, 4 deletions
diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 42f65b6d1..494811607 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -5,15 +5,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:= firefox PKG_VERSION:= 3.6.12 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 80f4d83f23a7c45fc3f1904964ea2a5a PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libnotify PKG_DEPENDS+= nspr nss libjpeg atk pango cairo libxt libx11 libstdcxx -PKG_DEPENDS+= libxdamage libxfixes libidl +PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libnotify libIDL libX11 -PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig +PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/ @@ -39,14 +39,17 @@ CONFIGURE_ENV+= CROSS_COMPILE=1 HOST_CC="${HOSTCC}" HOST_CFLAGS="${HOSTCFLAGS}" HOST_CXX="${HOSTCXX}" HOST_CXXFLAGS="${HOSTCXXFLAGS}" \ HOST_LIBIDL_CONFIG="/usr/bin/libIDL-config-2" \ CPPFLAGS="-I${STAGING_DIR}/usr/include/freetype2" \ + ac_cv_sqlite_secure_delete=yes \ ac_cv_thread_keyword=no \ ac_cv_sizeof_int_p=4 CONFIGURE_ARGS+= --enable-application=browser \ + --enable-official-branding \ --with-system-zlib \ --with-system-jpeg \ --with-system-png \ --with-system-nss \ --with-system-nspr \ + --enable-system-sqlite \ --with-libIDL-prefix=${STAGING_DIR}/usr \ --with-glib-prefix=${STAGING_DIR}/usr \ --enable-libxul \ diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 0127a7bab..bb6138223 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,5 +1,5 @@ --- mozilla-1.9.2.orig/configure 2010-10-27 05:09:28.000000000 +0200 -+++ mozilla-1.9.2/configure 2010-11-11 22:26:20.594995948 +0100 ++++ mozilla-1.9.2/configure 2010-11-25 20:36:24.969435934 +0100 @@ -3970,7 +3970,7 @@ else echo "$ac_t""yes" 1>&6 fi @@ -9,6 +9,15 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 +@@ -17895,7 +17895,7 @@ echo "configure:17889: checking for SQLI + else + + if test "$cross_compiling" = yes; then +- ac_cv_sqlite_secure_delete=no ++ ac_cv_sqlite_secure_delete=yes + + else + cat > conftest.$ac_ext <<EOF @@ -21465,8 +21465,8 @@ if test -n "$CROSS_COMPILE"; then HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" fi |