diff options
| author |   Alexander Gabert <pappy@gentoo.org> | 2003-10-10 18:51:34 +0000 |
|---|---|---|
| committer | Alexander Gabert <pappy@gentoo.org> | 2003-10-10 18:51:34 +0000 |
| commit | fcae657442eb7fd041b440b5123d3daf769226d3 (patch) | |
| tree | 96a2b826e0e76735405544bee77922408762f90a /app-office | |
| parent | changed hardened-gcc flags (diff) | |
| download | gentoo-2-fcae657442eb7fd041b440b5123d3daf769226d3.tar.gz gentoo-2-fcae657442eb7fd041b440b5123d3daf769226d3.tar.bz2 gentoo-2-fcae657442eb7fd041b440b5123d3daf769226d3.zip | |
changed 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, 10 insertions, 19 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 33ca6de8730c..7a720a3857b0 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.40 2003/10/09 19:48:03 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.41 2003/10/10 18:47:27 pappy Exp $ + + 10 Oct 2003; Alexander Gabert <pappy@gentoo.org> openoffice-1.0.3-r1.ebuild: + changed hardened-gcc flags 09 Oct 2003; Alexander Gabert <pappy@gentoo.org> openoffice-1.0.3-r1.ebuild: added new hppa dependent hardened-gcc flags diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index a9ab2e3e1978..2c46b0e1c4a8 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,7 +1,7 @@ -MD5 3cc5111b0f0503148f3fcce6c8a5f6b7 openoffice-1.0.3-r1.ebuild 21884 +MD5 7564812fd1fe3da72c7bf49ca9df4f6d openoffice-1.0.3-r1.ebuild 21884 MD5 3bd846d907128b23f1dd881c9dd85cd8 openoffice-1.1.0.ebuild 19634 MD5 2eb557537830964289b9939edbd5a133 openoffice-1.1_rc3.ebuild 19359 -MD5 a2e15495f47ac01c6d4180d37cd493c7 ChangeLog 10144 +MD5 d2404234b7a072784af927956d6972cc ChangeLog 10144 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 cc91404b3a8e..a3bb1ddee37c 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.7 2003/10/09 19:48:03 pappy Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r1.ebuild,v 1.8 2003/10/10 18:47:27 pappy Exp $ # IMPORTANT: This is extremely alpha!!! @@ -378,23 +378,11 @@ src_compile() { export CXX="$(gcc-getCXX)" # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml - #27761 - 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 - - if [ "${ARCH}" == "hppa64" ] && has_version 'sys-devel/hardened-gcc' - then + if has_version "sys-devel/hardened-gcc" + then export CC="${CC} -yet_exec" export CXX="${CXX} -yet_exec" - fi + fi # Enable ccache for this build (Az) if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \ |