summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2014-03-21 16:34:47 +0000
committerMike Frysinger <vapier@gentoo.org>2014-03-21 16:34:47 +0000
commit847a38bc0e02996aa9e33f7cdb83a89abc757519 (patch)
tree20b726411ec390238eacc4823af987cef557ff67 /net-misc/openssh
parentUpdated Aaron's e-mail address. (diff)
downloadgentoo-2-847a38bc0e02996aa9e33f7cdb83a89abc757519.tar.gz
gentoo-2-847a38bc0e02996aa9e33f7cdb83a89abc757519.tar.bz2
gentoo-2-847a38bc0e02996aa9e33f7cdb83a89abc757519.zip
Disable -ftrapv flag on hppa until gcc ICEs get sorted out #505182 by Jeroen Roovers.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'net-misc/openssh')
-rw-r--r--net-misc/openssh/ChangeLog6
-rw-r--r--net-misc/openssh/openssh-6.6_p1-r1.ebuild6
2 files changed, 9 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog
index 6a18f96aec0d..44342a0cfb8c 100644
--- a/net-misc/openssh/ChangeLog
+++ b/net-misc/openssh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/openssh
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.510 2014/03/20 20:58:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.511 2014/03/21 16:34:47 vapier Exp $
+
+ 21 Mar 2014; Mike Frysinger <vapier@gentoo.org> openssh-6.6_p1-r1.ebuild:
+ Disable -ftrapv flag on hppa until gcc ICEs get sorted out #505182 by Jeroen
+ Roovers.
20 Mar 2014; Mike Frysinger <vapier@gentoo.org> openssh-6.6_p1-r1.ebuild:
Mark arm64/ia64/m68k/s390/sh stable #505066.
diff --git a/net-misc/openssh/openssh-6.6_p1-r1.ebuild b/net-misc/openssh/openssh-6.6_p1-r1.ebuild
index 6bfbf7d8ff34..53f6f7f4429d 100644
--- a/net-misc/openssh/openssh-6.6_p1-r1.ebuild
+++ b/net-misc/openssh/openssh-6.6_p1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.6_p1-r1.ebuild,v 1.2 2014/03/20 20:58:31 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.6_p1-r1.ebuild,v 1.3 2014/03/21 16:34:47 vapier Exp $
EAPI="4"
inherit eutils user flag-o-matic multilib autotools pam systemd versionator
@@ -134,7 +134,9 @@ src_prepare() {
# Disable fortify flags ... our gcc does this for us
-e 's:-D_FORTIFY_SOURCE=2::'
)
- sed -i "${sed_args[@]}" configure{,.ac} || die
+ # The -ftrapv flag ICEs on hppa #505182
+ use hppa && sed_args+=( -e '/CFLAGS/s:-ftrapv::' )
+ sed -i "${sed_args[@]}" configure{.ac,} || die
epatch_user #473004