diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-11-11 21:12:07 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-11-11 21:12:07 +0000 |
| commit | 11711753241db5e58a4e7deb33b8e9e1ad8b323c (patch) | |
| tree | 329768f5aba0d2fda11ea3089558a1a812c766d2 /net-misc/openssh | |
| parent | Drop old versions. (diff) | |
| download | gentoo-2-11711753241db5e58a4e7deb33b8e9e1ad8b323c.tar.gz gentoo-2-11711753241db5e58a4e7deb33b8e9e1ad8b323c.tar.bz2 gentoo-2-11711753241db5e58a4e7deb33b8e9e1ad8b323c.zip | |
Do not hardcode `pkg-config`.
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Diffstat (limited to 'net-misc/openssh')
| -rw-r--r-- | net-misc/openssh/ChangeLog | 5 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-6.1_p1.ebuild | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/net-misc/openssh/ChangeLog b/net-misc/openssh/ChangeLog index 629412201778..420028a3f4ea 100644 --- a/net-misc/openssh/ChangeLog +++ b/net-misc/openssh/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/openssh # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.455 2012/11/06 02:44:11 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/ChangeLog,v 1.456 2012/11/11 21:12:07 vapier Exp $ + + 11 Nov 2012; Mike Frysinger <vapier@gentoo.org> openssh-6.1_p1.ebuild: + Do not hardcode `pkg-config`. 06 Nov 2012; Mike Gilbert <floppym@gentoo.org> openssh-5.5_p1-r2.ebuild, openssh-5.6_p1-r2.ebuild, openssh-5.7_p1-r1.ebuild, openssh-5.8_p1-r1.ebuild, diff --git a/net-misc/openssh/openssh-6.1_p1.ebuild b/net-misc/openssh/openssh-6.1_p1.ebuild index ad641005fa8d..bd6561639bbb 100644 --- a/net-misc/openssh/openssh-6.1_p1.ebuild +++ b/net-misc/openssh/openssh-6.1_p1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.5 2012/11/06 02:44:11 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openssh/openssh-6.1_p1.ebuild,v 1.6 2012/11/11 21:12:07 vapier Exp $ EAPI="2" inherit eutils user flag-o-matic multilib autotools pam systemd @@ -120,7 +120,8 @@ src_prepare() { cipher.c || die fi - sed -i "s:-lcrypto:$(pkg-config --libs openssl):" configure{,.ac} || die + tc-export PKG_CONFIG + sed -i "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):" configure{,.ac} || die # Disable PATH reset, trust what portage gives us. bug 254615 sed -i -e 's:^PATH=/:#PATH=/:' configure || die |