From d6316edbad7e1d128fcc697ea6bb6da964b7ec48 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Sat, 9 Apr 2011 17:56:30 +0200
Subject: firefox, maj 4.0-2, OK en 32 bits

---
 extra/firefox/Pkgfile | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

(limited to 'extra/firefox/Pkgfile')

diff --git a/extra/firefox/Pkgfile b/extra/firefox/Pkgfile
index b5088bdde..7f5eb5245 100644
--- a/extra/firefox/Pkgfile
+++ b/extra/firefox/Pkgfile
@@ -7,13 +7,24 @@
 
 name=firefox
 version=4.0
-release=1
+release=2
 source=(http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/source/$name-$version.source.tar.bz2\
 	http://releases.mozilla.org/pub/mozilla.org/$name/releases/$version/linux-i686/xpi/fr.xpi\
         firefox.desktop)
     
 build() {
-    export CXXFLAGS="$CXXFLAGS -fpermissive"
+    unset CXXFLAGS
+    unset CFLAGS
+    case `uname -m` in
+    x86_64)
+    	export CXXFLAGS="-O2 -fPIC -pipe -fpermissive"
+	export CFLAGS="-O2 -fPIC -pipe -fpermissive";;
+#	export CXXFLAGS="-fpermissive";;
+    
+    i?86)
+	export CXXFLAGS="-fpermissive";;
+    esac
+#    LDFLAGS="-Wl,-O1,--hash-style=gnu,--no-keep-memory"
     export MOZ_CO_PROJECT=browser
     export BUILD_OFFICIAL=1
     export MOZILLA_OFFICIAL=1
@@ -58,15 +69,14 @@ build() {
     	$PKG/usr/share/applications/
 
   # Localisation 
-  cd ..
-  bsdtar xf fr.xpi
-  cp -a chrome/fr $PKG/usr/lib/firefox/chrome
-  sed "s|chrome/||" chrome.manifest > $PKG/usr/lib/firefox/chrome/fr.manifest
-  cp install.rdf $PKG/usr/lib/firefox
-  rm $PKG/usr/lib/firefox/chrome/en-US.*
+#  cd ..
+#  bsdtar xf fr.xpi
+#  cp -a chrome/fr $PKG/usr/lib/firefox/chrome
+#  sed "s|chrome/||" chrome.manifest > $PKG/usr/lib/firefox/chrome/fr.manifest
+#  cp install.rdf $PKG/usr/lib/firefox
+#  rm $PKG/usr/lib/firefox/chrome/en-US.*
 
   # Suppression des fichiers headers et des dossiers vides
   find $PKG/usr/include/firefox -name "*.h" -delete
   find $PKG/usr/include/firefox -type d -empty -delete
 }
-  
-- 
cgit v1.2.3-70-g09d2