On Sat, 2006-11-11 at 13:02 +0800, David Woodhouse wrote: > On Fri, 2006-11-10 at 16:17 +0200, Gilboa Davara wrote: > > The attached patch (which should cover all 64bit arches) enable you to > > start the 32bit version of firefox (if it's installed) by starting > > firefox with the "--32" command line option. > > > > Before I submit this to bugzilla, I have two questions: > > > > - Do we rather have a single firefox script that executes both 32bit and > > 64bit or do we want to break the it to dedicated firefox[64] and > > firefox32 scripts. > > Please make sure it defaults to 32-bit firefox on ppc64, just like most > of the rest of userspace does (including the Java and RealPlayer > plugins). If you _really_ want ppc64 firefox, you should need to run > with '--64' to get it. > Done. - Gilboa
--- /usr/bin/firefox.old 2006-11-10 15:16:47.000000000 +0200 +++ /usr/bin/firefox 2006-11-11 08:53:49.000000000 +0200 @@ -36,12 +36,45 @@ ## ## Variables ## -MOZ_LIB_DIR="/usr/lib" -if [ -x "/usr/lib64/firefox-1.5.0.8/firefox-bin" ] -then - MOZ_LIB_DIR="/usr/lib64" +MOZ_VERSION=1.5.0.8 + +## +## 10/11/2006. Gilboa Davara <gilboad at gmail dot com> +## This patch adds multilib support for x86_64/PPC64/s390/IA64. +## +if [ "$1" == "--32" ] || [ "$1" == "--64" ] ; then + MOZ_OPTION=$1 + shift fi -MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-1.5.0.8" + +MOZ_ARCH=$(uname -m) +case $MOZ_ARCH in + x86_64 | ia64 | s390 ) + MOZ_LIB_DIR="/usr/lib" + MOZ_DISPLAY_ARCH="32bit" + if [ "$MOZ_OPTION" != "--32" ] && [ -x "/usr/lib64/firefox-$MOZ_VERSION/firefox-bin" ] ; then + MOZ_LIB_DIR="/usr/lib64" + MOZ_DISPLAY_ARCH="64bit" + fi + echo "Starting the $MOZ_DISPLAY_ARCH version of firefox..." + ;; + + ppc64 ) + MOZ_LIB_DIR="/usr/lib" + MOZ_DISPLAY_ARCH="32bit" + if [ "$MOZ_OPTION" == "--64" ] && [ -x "/usr/lib64/firefox-$MOZ_VERSION/firefox-bin" ] ; then + MOZ_LIB_DIR="/usr/lib64" + MOZ_DISPLAY_ARCH="64bit" + fi + echo "Starting the $MOZ_DISPLAY_ARCH version of firefox..." + ;; + + * ) + MOZ_LIB_DIR="/usr/lib" + ;; +esac + +MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-$MOZ_VERSION" MOZ_PROGRAM="$MOZ_DIST_BIN/firefox" MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client" MOZ_CLIENT_PROGRAM_PARAM="-a firefox"
-- fedora-devel-list mailing list fedora-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/fedora-devel-list
