diff options
| author |   Alexander Gabert <pappy@gentoo.org> | 2003-10-09 19:51:43 +0000 |
|---|---|---|
| committer | Alexander Gabert <pappy@gentoo.org> | 2003-10-09 19:51:43 +0000 |
| commit | 6c004f029fdfd8ded67746d957ef50fdcc31bc43 (patch) | |
| tree | 624e09bc4a0c894586c0922579a035a925ef1d7c /app-office | |
| parent | added new hppa dependent hardened-gcc flags (diff) | |
| download | gentoo-2-6c004f029fdfd8ded67746d957ef50fdcc31bc43.tar.gz gentoo-2-6c004f029fdfd8ded67746d957ef50fdcc31bc43.tar.bz2 gentoo-2-6c004f029fdfd8ded67746d957ef50fdcc31bc43.zip | |
added new hppa dependent hardened-gcc flags
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/openoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/openoffice/Manifest | 4 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-1.0.3-r1.ebuild | 20 |
3 files changed, 22 insertions, 7 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 724533d112ae..33ca6de8730c 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/openoffice # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.39 2003/10/08 12:52:32 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.40 2003/10/09 19:48:03 pappy Exp $ + + 09 Oct 2003; Alexander Gabert <pappy@gentoo.org> openoffice-1.0.3-r1.ebuild: + added new hppa dependent hardened-gcc flags 08 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> openoffice-1.1.0.ebuild: Fix ccache test so that the old style ccache works again (if replaced by elif) diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index 05b14d390a03..e436cf9bdf52 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,7 +1,7 @@ -MD5 4d1de9796a63b51247bfdf222951b0df openoffice-1.0.3-r1.ebuild 22293 +MD5 d28bccf886000c9ce2f2e85067889210 openoffice-1.0.3-r1.ebuild 22293 MD5 3bd846d907128b23f1dd881c9dd85cd8 openoffice-1.1.0.ebuild 19634 MD5 2eb557537830964289b9939edbd5a133 openoffice-1.1_rc3.ebuild 19359 -MD5 f645c925bef7dbfedec01545156cecca ChangeLog 10036 +MD5 1d450f2fd4f433922955f76ab1927f57 ChangeLog 10035 MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461 MD5 a6c9d8c5763378f5bae1e4ac50a2ecaf files/digest-openoffice-1.1_rc3 196 MD5 9d1828c128b70f1612c0c31b69719a26 files/digest-openoffice-1.1.0 195 diff --git a/app-office/openoffice/openoffice-1.0.3-r1.ebuild b/app-office/openoffice/openoffice-1.0.3-r1.ebuild index f32ca9de64ad..cc91404b3a8e 100644 --- a/app-office/openoffice/openoffice-1.0.3-r1.ebuild +++ b/app-office/openoffice/openoffice-1.0.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r1.ebuild,v 1.6 2003/09/07 10:02:33 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r1.ebuild,v 1.7 2003/10/09 19:48:03 pappy Exp $ # IMPORTANT: This is extremely alpha!!! @@ -378,11 +378,23 @@ src_compile() { export CXX="$(gcc-getCXX)" # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml - #27761 - if has_version 'sys-devel/hardened-gcc' && [ "${CC}"="gcc" ] - then + if [ "${ARCH}" != "hppa" ] && [ "${ARCH}" != "hppa64" ] && has_version "sys-devel/hardened-gcc" + then + export CC="${CC} -yet_exec -fstack-protector" + export CXX="${CXX} -yet_exec -fstack-protector" + fi + + if [ "${ARCH}" == "hppa" ] && has_version 'sys-devel/hardened-gcc' + then export CC="${CC} -yet_exec" export CXX="${CXX} -yet_exec" - fi + fi + + if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc' + then + export CC="${CC} -yet_exec" + export CXX="${CXX} -yet_exec" + fi # Enable ccache for this build (Az) if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \ |