summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Malm <gengor@gentoo.org>2009-07-10 23:10:15 +0000
committerGordon Malm <gengor@gentoo.org>2009-07-10 23:10:15 +0000
commita19d7a80b317dbcb856c19773b8e8fb74ccaf676 (patch)
tree796002b88edafd2701713296572247f93e318586 /app-office/openoffice
parentcleanup and introduce new upstream patches (see http://www.lua.org/bugs.html (diff)
downloadgentoo-2-a19d7a80b317dbcb856c19773b8e8fb74ccaf676.tar.gz
gentoo-2-a19d7a80b317dbcb856c19773b8e8fb74ccaf676.tar.bz2
gentoo-2-a19d7a80b317dbcb856c19773b8e8fb74ccaf676.zip
Filter SSP for <gcc-4 only, thanks to Magnus Granberg.
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'app-office/openoffice')
-rw-r--r--app-office/openoffice/ChangeLog6
-rw-r--r--app-office/openoffice/openoffice-3.0.0.ebuild6
-rw-r--r--app-office/openoffice/openoffice-3.0.1.ebuild6
-rw-r--r--app-office/openoffice/openoffice-3.1.0.ebuild6
4 files changed, 14 insertions, 10 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 0e4ba52a75d1..ca36201d5bde 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/openoffice
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.467 2009/05/31 15:35:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.468 2009/07/10 23:10:15 gengor Exp $
+
+ 10 Jul 2009; Gordon Malm <gengor@gentoo.org> openoffice-3.0.0.ebuild,
+ openoffice-3.0.1.ebuild, openoffice-3.1.0.ebuild:
+ Filter SSP for <gcc-4 only, thanks to Magnus Granberg.
31 May 2009; Andreas Proschofsky <suka@gentoo.org>
openoffice-3.1.0.ebuild:
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
index 49f9669d175b..0739c0182132 100644
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ b/app-office/openoffice/openoffice-3.0.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.25 2009/05/12 20:36:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.26 2009/07/10 23:10:15 gengor Exp $
WANT_AUTOCONF="2.5"
WANT_AUTOMAKE="1.9"
@@ -301,14 +301,14 @@ src_compile() {
filter-flags "-funroll-loops"
filter-flags "-fprefetch-loop-arrays"
filter-flags "-fno-default-inline"
- filter-flags "-fstack-protector"
- filter-flags "-fstack-protector-all"
filter-flags "-ftracer"
filter-flags "-fforce-addr"
filter-flags "-O[s2-9]"
if [[ $(gcc-major-version) -lt 4 ]]; then
+ filter-flags "-fstack-protector"
+ filter-flags "-fstack-protector-all"
replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
fi
diff --git a/app-office/openoffice/openoffice-3.0.1.ebuild b/app-office/openoffice/openoffice-3.0.1.ebuild
index 804e0b07a6ad..12182afb1ae4 100644
--- a/app-office/openoffice/openoffice-3.0.1.ebuild
+++ b/app-office/openoffice/openoffice-3.0.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.11 2009/05/12 20:36:22 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.1.ebuild,v 1.12 2009/07/10 23:10:15 gengor Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -282,14 +282,14 @@ src_configure() {
filter-flags "-funroll-loops"
filter-flags "-fprefetch-loop-arrays"
filter-flags "-fno-default-inline"
- filter-flags "-fstack-protector"
- filter-flags "-fstack-protector-all"
filter-flags "-ftracer"
filter-flags "-fforce-addr"
filter-flags "-O[s2-9]"
if [[ $(gcc-major-version) -lt 4 ]]; then
+ filter-flags "-fstack-protector"
+ filter-flags "-fstack-protector-all"
replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
fi
diff --git a/app-office/openoffice/openoffice-3.1.0.ebuild b/app-office/openoffice/openoffice-3.1.0.ebuild
index 1289f816a98f..bbc740523f60 100644
--- a/app-office/openoffice/openoffice-3.1.0.ebuild
+++ b/app-office/openoffice/openoffice-3.1.0.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.6 2009/05/31 15:35:26 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.0.ebuild,v 1.7 2009/07/10 23:10:15 gengor Exp $
WANT_AUTOMAKE="1.9"
EAPI="2"
@@ -292,14 +292,14 @@ src_configure() {
filter-flags "-funroll-loops"
filter-flags "-fprefetch-loop-arrays"
filter-flags "-fno-default-inline"
- filter-flags "-fstack-protector"
- filter-flags "-fstack-protector-all"
filter-flags "-ftracer"
filter-flags "-fforce-addr"
filter-flags "-O[s2-9]"
if [[ $(gcc-major-version) -lt 4 ]]; then
+ filter-flags "-fstack-protector"
+ filter-flags "-fstack-protector-all"
replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
fi