[gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/

[Fabian Groffen]

commit:     6557d42ab43f296d11ce0b249614b3b41ea1cf9e
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 08:27:40 2016 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Tue Dec 20 08:28:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6557d42a

net-misc/openssh: fix compilation on Solaris

Package-Manager: portage-2.3.0

 net-misc/openssh/openssh-7.3_p1-r8.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net-misc/openssh/openssh-7.3_p1-r8.ebuild 
b/net-misc/openssh/openssh-7.3_p1-r8.ebuild
index 29bbe50..a03905c 100644
--- a/net-misc/openssh/openssh-7.3_p1-r8.ebuild
+++ b/net-misc/openssh/openssh-7.3_p1-r8.ebuild
@@ -162,6 +162,10 @@ src_prepare() {
                -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
                -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
        )
+       # _XOPEN_SOURCE causes header conflicts on Solaris
+       [[ ${CHOST} == *-solaris* ]] && sed_args+=(
+               -e 's/-D_XOPEN_SOURCE//'
+       )
        sed -i "${sed_args[@]}" configure{.ac,} || die
 
        epatch_user #473004