[Frugalware-git] frugalware-current: thunderbird-3.1.1-2-i686

[Michel Hermier]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=920d4d392b9d86900ef5a389be6ab3747f71a986

commit 920d4d392b9d86900ef5a389be6ab3747f71a986
Author: Michel Hermier <hermier at frugalware.org>
Date:   Tue Aug 3 12:26:00 2010 +0200

thunderbird-3.1.1-2-i686

* Fix gcc optimisation flags, we must use -O2, -Os is broken and not
recommanded by intel.

diff --git a/source/lib/libcap/FrugalBuild b/source/lib/libcap/FrugalBuild
index aaa0279..326a683 100644
--- a/source/lib/libcap/FrugalBuild
+++ b/source/lib/libcap/FrugalBuild
@@ -16,13 +16,8 @@ signatures=(${source}.sign)

build() {
Fsed '-O2' "${CFLAGS}" Make.Rules
-	sed -i \
-		-e "/^lib=/s:=.*:=/usr/lib:" \
-		Make.Rules
-	Fbuild DESTDIR=$Fdestdir prefix=/usr install
-	if [ "$CARCH" == "x86_64" ]; then
-		 Fmv /usr/lib64 /usr/lib
-	fi
+	Fbuild
+	[ "$CARCH" == "x86_64" ] && Fmv /usr/lib64 /usr/lib
}

# optimization OK
diff --git a/source/xapps/thunderbird/FrugalBuild b/source/xapps/thunderbird/FrugalBuild
index 58825ba..86426a3 100644
--- a/source/xapps/thunderbird/FrugalBuild
+++ b/source/xapps/thunderbird/FrugalBuild
@@ -4,7 +4,7 @@

pkgname=thunderbird
pkgver=3.1.1
-pkgrel=1
+pkgrel=2
pkgdesc="Mozilla Thunderbird mail and newsgroup client"
url="http://www.mozilla.org/products/thunderbird/"
depends=('alsa-lib' 'curl' 'cairo>=1.8.10-2' 'dbus-glib' 'gtk+2>=2.20.0-2' 'libpng>=1.4.1' 'nss>=3.12.6' \
@@ -26,9 +26,9 @@ build()
unset MAKEFLAGS
Fcd comm-1.9.*

-	## and again > -Os broken weird .. use -Os here *again*
-	export CFLAGS="${CFLAGS[@]/-O2/-Os}"
-	export CXXFLAGS="${CXXFLAGS[@]/-O2/-Os}"
+	## and again > -Os broken weird .. use -O2 here *again*
+	export CFLAGS="${CFLAGS[@]/-Os/-O2}"
+	export CXXFLAGS="${CXXFLAGS[@]/-Os/-O2}"

export MOZILLA_OFFICIAL=1
export BUILD_OFFICIAL=1
@@ -88,7 +88,7 @@ build()


# Does not use Fmakeinstall here because DESDIR is not found in root Makefile
-	Fexec make DESTDIR="$Fdestdir" install
+	Fexec make DESTDIR="$Fdestdir" install || Fdie

# Get rid of versions in path names and files.
Fmv /usr/lib/$pkgname-$pkgver /usr/lib/$pkgname