X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Ffirefox;h=cc08c0bb8a2b513bf7218961577bca5574f991a0;hb=44d3c1f9f0e8fc945206020c4bd7a15c5a457f55;hp=180865c9f4a11d4ee8492bbe2864392fec348907;hpb=d850183ab004abc65a405b3d925ab3f274e854b5;p=hvlinux.git diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox index 180865c..cc08c0b 100644 --- a/stage5/pkg/firefox +++ b/stage5/pkg/firefox @@ -3,107 +3,74 @@ hvbuild() { FIREFOX_BUILD_DIR="${PACKAGE}-build" + FIREFOX_VERSION="$(get_pkg_ver ${PACKAGE})" FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})" - # This file contains the options used in the Firefox build. - cd ${LFS_TMP}/${PACKAGE} - cat > .mozconfig << "EOF" -# Use the default settings specified in the source tree. -# This includes the option --enable-application=browser -. $topsrcdir/browser/config/mozconfig + cd ${SRC_DIR} + # Use the default settings specified in the source tree. + echo '. $topsrcdir/browser/config/mozconfig' > .mozconfig + + cat >> .mozconfig << "EOF" # Create an object directory and specify to build the package in that # directory. If desired, modify the location of the object directory # to a directory inside the source tree by removing '../' from the # line below. mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../_FIREFOX_BUILD_DIR_ -# Specify the installation prefix. If you would prefer Firefox -# installed in a different prefix, modify the line below to fit -# your needs. You'll also need to modify some of the instructions in -# the BLFS book to point to your desired prefix. ac_add_options --prefix=/usr -# Compile with a minimal level of optimization -ac_add_options --enable-optimize - -# These options are used so that the Firefox binaries are linked to -# the system-installed copies of the specified libraries instead of -# the source tree code which may not be the most recent versions. +# System libraries +ac_add_options --enable-system-cairo +ac_add_options --enable-system-lcms +ac_add_options --enable-system-sqlite +ac_add_options --with-system-libevent +ac_add_options --with-system-libvpx ac_add_options --with-system-zlib +ac_add_options --with-system-bz2 ac_add_options --with-system-jpeg ac_add_options --with-system-png +ac_add_options --enable-system-ffi +ac_add_options --enable-system-pixman +###ac_add_options --enable-gstreamer=1.0 -ac_add_options --enable-system-cairo -ac_add_options --enable-system-lcms -ac_add_options --enable-system-sqlite +ac_add_options --enable-shared-js ac_add_options --enable-startup-notification - ac_add_options --enable-svg +ac_add_options --with-pthreads -# These two options enable support for building Firefox with -# system-installed versions of the Network Security Services (NSS) -# and Netscape Portable Runtime (NSPR) libraries. We build these -# as part of xulrunner, so we can use them here. For a standalone -# firefox you might want to comment these. -#ac_add_options --with-system-nspr -#ac_add_options --with-system-nss +# Compile with a minimal level of optimization +ac_add_options --enable-optimize -ac_add_options --disable-gnomevfs +# Remove the debugging symbols from the installed binaries. +ac_add_options --enable-strip +ac_add_options --enable-install-strip -# uncomment this if you did not build curl -ac_add_options --disable-crashreporter +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-icu -# This option is added so that the Mozilla Installer program is not -# built or installed. The program is not required for a BLFS -# installation of Firefox. +ac_add_options --disable-gnomevfs +ac_add_options --disable-crashreporter ac_add_options --disable-installer - -# The updater is not useful if you build from source. ac_add_options --disable-updater - -# Disable the a11y support in the Firefox binaries. ac_add_options --disable-accessibility - -# This option is added so that test libraries and programs are not -# built. These would only be required for debugging purposes. ac_add_options --disable-tests - -# The mochitest is a separate test feature and has caused problems -# in the past. ac_add_options --disable-mochitest +ac_add_options --disable-pulseaudio -# This option is used to enable source tree included LDAP support in -# the Firefox binaries. -################################################################### -# -# NOTE: You must uncomment this option if there is any chance of -# compiling the OpenOffice package from source code using this copy -# of Firefox for your Mozilla support. -# -################################################################### -# Removed this option to fix bug with: -# make[3]: Entering directory `/tmp/firefox-3.0.1-build/directory/c-sdk' -# make[3]: *** No targets specified and no makefile found. Stop. -######ac_add_options --enable-ldap +# use the anti-phishing blacklist +ac_add_options --enable-safe-browsing # This option causes the installed binaries to have the official -# Firefox name embedded in them. Due to license restrictions, you -# may not distribute binaries created using this option. +# Firefox name embedded in them. ac_add_options --enable-official-branding +ac_add_options --enable-url-classifier -# use the anti-phishing blacklist -ac_add_options --enable-safe-browsing +ac_add_options --enable-gio -# This option is used so that the debugging symbols are removed from -# the installed binaries during the installation process. Comment out -# this option if you may have a need to retain the debugging symbols -# in the installed binaries. Note that this can substantially -# increase the size of the installed binaries. -ac_add_options --enable-strip - -# Point to the xulrunner libraries - comment this for a standalone browser -#ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-1.9.0.7 +# If you enable javaxpcom, you must have a java compiler installed. +ac_add_options --disable-javaxpcom EOF sed -i -e "s!_FIREFOX_BUILD_DIR_!${FIREFOX_BUILD_DIR}!g" .mozconfig @@ -111,16 +78,10 @@ EOF echo "ac_add_options --disable-necko-wifi" >> .mozconfig fi - make -f client.mk build - make -f client.mk install - - # Remove old links and create new ones - rm -f /usr/lib/mozilla - ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/mozilla - rm -f /usr/lib/firefox - ln -v -sf ${FIREFOX_PKG_VERSION} /usr/lib/firefox + MOZ_MAKE_FLAGS="-j${MAKEJOBS}" + make -f client.mk + make -C ${LFS_TMP}/${PACKAGE}-build install INSTALL_SDK= - # Addition to /etc/ld.so.conf - # This is necessary for shared library libmozjs.so (needed by gxine) - string_add "/usr/lib/${FIREFOX_PKG_VERSION}" /etc/ld.so.conf + install -v -m755 -d /usr/lib/mozilla/plugins + ln -sfv ../../mozilla/plugins /usr/lib/firefox-${FIREFOX_VERSION}/browser }