Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv21955
Modified Files:
tenfourfox5.info tenfourfox5.patch
Log Message:
experimental, auto-tuning for CPU {G3,G4,G4e,G5}!
Index: tenfourfox5.patch
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/tenfourfox5.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tenfourfox5.patch 23 Jun 2011 16:36:54 -0000 1.4
+++ tenfourfox5.patch 23 Jun 2011 21:22:40 -0000 1.5
@@ -1,33 +1,47 @@
+--- /dev/null
+++ mozilla-release/.mozconfig 2009-04-27 16:56:30.000000000 -0400
-@@ -0,0 +1,53 @@
+@@ -0,0 +1,66 @@
+# sh
+# Build configuration script
+#
+# See https://developer.mozilla.org/en/Configuring_Build_Options for build
options.
-+#
++# and http://code.google.com/p/tenfourfox/wiki/HowToBuildNow
+
-+. $topsrcdir/browser/config/mozconfig
++# default to G3 if unknown
++tune=G3
++case `machine` in
++ ppc750) tune=G3 ;;
++ ppc7400) tune=G4-7400 ;;
++ ppc7450) tune=G4-7450 ;;
++ ppc970) tune=G5 ;;
++esac
++. $topsrcdir/$tune.mozcfg
++
++# This is already called inside the above config:
++# . $topsrcdir/browser/config/mozconfig
+
+# Options for client.mk.
+# environment variables to set
+
-+mk_add_options
MOZ_OBJDIR=@TOPSRCDIR@/obj-@FINK_ARCH_TARGET@-apple-darwin`uname -r`
-+mk_add_options AUTOCONF=autoconf
-+SRCDIR=@SRCDIR@
++mk_add_options
MOZ_OBJDIR=$topsrcdir/obj-@FINK_ARCH_TARGET@-apple-darwin`uname -r`
++#mk_add_options AUTOCONF=autoconf
++
++# compiler wrappers
+GCC_PREFIX="flag-sort"
-+GCC_EXEC_OVERRIDE="-B$SRCDIR/opt-bin"
-+CC="$GCC_PREFIX gcc-4.0 $GCC_EXEC_OVERRIDE"
-+CXX="$GCC_PREFIX g++-4.0 $GCC_EXEC_OVERRIDE"
++GCC_EXEC_OVERRIDE="-B$topsrcdir/opt-bin"
++CC="$GCC_PREFIX $CC $GCC_EXEC_OVERRIDE"
++CXX="$GCC_PREFIX $CXX $GCC_EXEC_OVERRIDE"
++
+ac_add_options --target=@FINK_ARCH_TARGET@-apple-darwin`uname -r`
-+ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
-+HOST_CC="$CC"
-+HOST_CXX="$CXX"
-+RANLIB=/usr/bin/ranlib
-+AR=/usr/bin/ar
-+AS=$CC
-+LD="$GCC_EXEC_OVERRIDE/ld"
-+STRIP="strip -x -S"
-+CROSS_COMPILE=1
++#ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
++#HOST_CC="$CC"
++#HOST_CXX="$CXX"
++#RANLIB=/usr/bin/ranlib
++#AR=/usr/bin/ar
++#AS=$CC
++#LD="$GCC_EXEC_OVERRIDE/ld"
++#STRIP="strip -x -S"
++#CROSS_COMPILE=1
+
+# Options for 'configure' (same as command-line options).
+ac_add_options --prefix=@FINKPREFIX@
@@ -41,27 +55,18 @@
+#ac_add_options --enable-extensions=default,-gnomevfs
+
+#ac_add_options --disable-dependency-tracking
-+ac_add_options --disable-crashreporter
-+ac_add_options --disable-ipc
++#ac_add_options --disable-crashreporter
++#ac_add_options --disable-ipc
+ac_add_options --disable-necko-wifi
+
-+ac_add_options --disable-debug
-+ac_add_options --disable-tests
-+ac_add_options --enable-strip
-+ac_add_options --enable-macos-target=10.4
-+#ac_add_options --with-default-mozilla-five-home=@FINKPREFIX@/lib/firefox4
++#ac_add_options --disable-debug
++#ac_add_options --disable-tests
++#ac_add_options --enable-strip
++#ac_add_options --enable-macos-target=10.4
++#ac_add_options --with-default-mozilla-five-home=@FINKPREFIX@/lib/firefox5
+ac_add_options --with-system-jpeg=@FINKPREFIX@
+ac_add_options --disable-system-cairo
+ac_add_options --disable-system-sqlite
-+
-+# from tenfourfox patchset [export/3]:
-+ac_add_options --disable-static
-+ac_add_options --disable-libxul
-+ac_add_options --enable-chrome-format=jar
-+ac_add_options --enable-optimizations
-+ac_add_options --disable-cpp-exceptions
-+ac_add_options --enable-printing
-+ac_add_options --enable-prebinding
diff -ruN
mozilla-release-orig/browser/locales/generic/profile/bookmarks.html.in
mozilla-release/browser/locales/generic/profile/bookmarks.html.in
--- mozilla-release-orig/browser/locales/generic/profile/bookmarks.html.in
2009-04-23 21:46:37.000000000 -0400
+++ mozilla-release/browser/locales/generic/profile/bookmarks.html.in
2009-04-27 16:56:30.000000000 -0400
Index: tenfourfox5.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/tenfourfox5.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- tenfourfox5.info 23 Jun 2011 16:36:54 -0000 1.6
+++ tenfourfox5.info 23 Jun 2011 21:22:40 -0000 1.7
@@ -1,7 +1,7 @@
Info3: <<
Package: tenfourfox5
Version: 5.0
-Revision: 1
+Revision: 2
Distribution: 10.4, 10.5
Architecture: powerpc
Description: Port of Firefox 5 to 10.4 and PowerPC
@@ -53,7 +53,7 @@
Source3: http://tenfourfox.googlecode.com/files/ldx3.zip
Source3-MD5: 849c5bc88f06387bbd2040cf804204e7
PatchFile: %n.patch
-PatchFile-MD5: 63c190acd1a86fda0d1f57164b6147ea
+PatchFile-MD5: 5f6a780246066a8f037040d64518f994
PatchScript: <<
#!/bin/sh -ev
# apply patchset from TenFourFox:
@@ -67,7 +67,6 @@
echo "Applying patch %{PatchFile} ..."
/usr/bin/sed -e 's|@FINKPREFIX@|%p|g' \
-e 's|@FINK_ARCH_TARGET@|%m|g' \
- -e 's|@SRCDIR@|%b|g' \
< %{PatchFile} | /usr/bin/patch -p1
# leave @executable_path alone and take care of adjusting install_names
# between build and install, below.
@@ -82,6 +81,22 @@
popd
sed -e '/^#/!s|/usr/bin|%b/opt-bin|' SHIM.ld > opt-bin/ld
chmod +x opt-bin/ld
+ # enable processor-specific optimization and tuning
+ for f in *.mozcfg
+ do
+ sed -i.orig -e '/AUTOCONF/s|autoconf213|autoconf|' \
+ -e '/MOZ_MAKE_FLAGS/s|^|# |' \
+ -e '/MOZ_OBJDIR/s|^|# |' $f
+ done
+ # .mozconfig will dispatch the right CPU.mozcfg
+ cpu=`machine`
+ case $cpu in
+ ppc750) alt=G3 ;;
+ ppc7400) alt=G4 ;;
+ ppc7450) alt=G4e ;;
+ ppc970) alt=G5 ;;
+ esac
+ sed -i.orig -e "/OPTIMIZED_FOR/s|Debugging|$cpu ($alt)|"
netwerk/protocol/http/OptimizedFor.h
<<
# even on 10.5
SetMACOSX_DEPLOYMENT_TARGET: 10.4
@@ -199,6 +214,9 @@
I've added it to BuildConflicts to be safe.
<<
DescPort: <<
+All the hard work is done by the developers of TenFourFox,
+led by Cameron Kaiser.
+
Bunch of patches to rules.mk and client.mk are for enabling
parallel builds to share the same jobserver as the master/parent
make, so recursive instances of make benefit from -jN MAKEFLAGS.
@@ -222,6 +240,5 @@
--enable-system-hunspell
--enable-system-pixman
-TODO: enable optimization selection
<<
<<
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
