X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fpkg%2Ffirefox;h=cc08c0bb8a2b513bf7218961577bca5574f991a0;hb=78453e212ec7952477a5de2f702bfcab54e7a89c;hp=1035f8275ec6e939b0e1d62e2951c78945b0e948;hpb=4cb8a57fb3733338b89963330a28ac8a19775591;p=hvlinux.git diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox index 1035f82..cc08c0b 100644 --- a/stage5/pkg/firefox +++ b/stage5/pkg/firefox @@ -6,16 +6,10 @@ hvbuild() FIREFOX_VERSION="$(get_pkg_ver ${PACKAGE})" FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})" - cd ${LFS_TMP}/${PACKAGE} - - echo "# This file contains the options used in the Firefox or Xulrunner build." > .mozconfig + cd ${SRC_DIR} # Use the default settings specified in the source tree. - if [ "x${HVLABEL}" = "x${FIREFOX}-xulrunner" ]; then - echo '. $topsrcdir/xulrunner/config/mozconfig' >> .mozconfig - else - echo '. $topsrcdir/browser/config/mozconfig' >> .mozconfig - fi + echo '. $topsrcdir/browser/config/mozconfig' > .mozconfig cat >> .mozconfig << "EOF" # Create an object directory and specify to build the package in that @@ -24,92 +18,70 @@ hvbuild() # 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 or Xulrunner 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. -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-png - +# 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 --enable-startup-notification +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-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 +ac_add_options --with-system-nspr +ac_add_options --with-system-nss +ac_add_options --with-system-icu + +ac_add_options --disable-gnomevfs ac_add_options --disable-crashreporter ac_add_options --disable-installer ac_add_options --disable-updater ac_add_options --disable-accessibility ac_add_options --disable-tests ac_add_options --disable-mochitest +ac_add_options --disable-pulseaudio # use the anti-phishing blacklist ac_add_options --enable-safe-browsing -# Remove the debugging symbols from the installed binaries. -ac_add_options --enable-strip +# This option causes the installed binaries to have the official +# Firefox name embedded in them. +ac_add_options --enable-official-branding +ac_add_options --enable-url-classifier + +ac_add_options --enable-gio # If you enable javaxpcom, you must have a java compiler installed. ac_add_options --disable-javaxpcom EOF - if [ "x${HVLABEL}" = "x${FIREFOX}-browser" ]; then - # Point to the xulrunner libraries. - echo "ac_add_options --with-system-libxul" >> .mozconfig - echo "ac_add_options --with-libxul-sdk=/usr/lib/xulrunner-devel-${FIREFOX_VERSION}" >> .mozconfig - - # This option causes the installed binaries to have the official - # Firefox name embedded in them. - echo "ac_add_options --enable-official-branding" >> .mozconfig - fi - sed -i -e "s!_FIREFOX_BUILD_DIR_!${FIREFOX_BUILD_DIR}!g" .mozconfig if [ -z "${WIFI_SUPPORT}" ]; then echo "ac_add_options --disable-necko-wifi" >> .mozconfig fi - make -f client.mk build - make -f client.mk install - - if [ "x${HVLABEL}" = "x${FIREFOX}-xulrunner" ]; then - install -v -m755 -d /usr/lib/mozilla - - # Remove old links (if applicable) and create new ones - rm -f /usr/lib/mozilla/plugins - ln -sv /usr/lib/xulrunner-${FIREFOX_VERSION}/plugins /usr/lib/mozilla - chown -Rv root:root /usr/lib/xulrunner-* \ - /usr/share/idl/xulrunner-* \ - /usr/include/xulrunner-* - - # Fixes the error "run-mozilla.sh: no such file or directory" - ln -s /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/sdk/bin/run-mozilla.sh /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/bin - ln -s /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/sdk/bin/xpcshell /usr/lib/xulrunner-devel-${FIREFOX_VERSION}/bin - else - rm /usr/bin/firefox - echo "#!/bin/bash" > /usr/bin/firefox - echo "/usr/lib/xulrunner-${FIREFOX_VERSION}/xulrunner /usr/lib/firefox-${FIREFOX_VERSION}/application.ini \"\${@}\"" >> /usr/bin/firefox - chmod 755 /usr/bin/firefox - fi + MOZ_MAKE_FLAGS="-j${MAKEJOBS}" + make -f client.mk + make -C ${LFS_TMP}/${PACKAGE}-build install INSTALL_SDK= + + install -v -m755 -d /usr/lib/mozilla/plugins + ln -sfv ../../mozilla/plugins /usr/lib/firefox-${FIREFOX_VERSION}/browser }