diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-09-30 12:08:21 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-09-30 12:08:21 +0000 |
| commit | de40909f7c1ce67edbcc030fe2601b03f01f876e (patch) | |
| tree | 440a6b1d4074bb852b0eaff431e7ae4c3cf05cba /dev-libs/openssl | |
| parent | masking =dev-lang/php-5.1* (diff) | |
| download | gentoo-2-de40909f7c1ce67edbcc030fe2601b03f01f876e.tar.gz gentoo-2-de40909f7c1ce67edbcc030fe2601b03f01f876e.tar.bz2 gentoo-2-de40909f7c1ce67edbcc030fe2601b03f01f876e.zip | |
Fix building on Gentoo/BSD setups where `make` != `$MAKE` #146316.
(Portage version: 2.1.3.9)
Diffstat (limited to 'dev-libs/openssl')
| -rw-r--r-- | dev-libs/openssl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-libs/openssl/files/openssl-0.9.8e-make.patch | 24 | ||||
| -rw-r--r-- | dev-libs/openssl/openssl-0.9.8e-r3.ebuild | 3 |
3 files changed, 31 insertions, 2 deletions
diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index f4aba1b1bd32..6595d1819804 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.223 2007/09/30 06:26:36 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.224 2007/09/30 12:08:21 vapier Exp $ + + 30 Sep 2007; Mike Frysinger <vapier@gentoo.org> + +files/openssl-0.9.8e-make.patch, openssl-0.9.8e-r3.ebuild: + Fix building on Gentoo/BSD setups where `make` != `$MAKE` #146316. 30 Sep 2007; Markus Rothe <corsair@gentoo.org> openssl-0.9.8e-r3.ebuild: Stable on ppc64; bug #194039 diff --git a/dev-libs/openssl/files/openssl-0.9.8e-make.patch b/dev-libs/openssl/files/openssl-0.9.8e-make.patch new file mode 100644 index 000000000000..15927e476210 --- /dev/null +++ b/dev-libs/openssl/files/openssl-0.9.8e-make.patch @@ -0,0 +1,24 @@ +respect $MAKE if it is set in the environment so we don't get a mix +of the host `make` and whatever $MAKE is set to when recursing + +http://bugs.gentoo.org/146316 + +--- openssl-0.9.8e/Configure ++++ openssl-0.9.8e/Configure +@@ -931,6 +931,7 @@ + $default_ranlib= &which("ranlib") or $default_ranlib="true"; + $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl") + or $perl="perl"; ++my $make = $ENV{'MAKE'} || "make"; + + chop $openssldir if $openssldir =~ /\/$/; + chop $prefix if $prefix =~ /\/$/; +@@ -1554,7 +1557,7 @@ + EOF + close(OUT); + } else { +- my $make_command = "make PERL=\'$perl\'"; ++ my $make_command = "$make PERL=\'$perl\'"; + my $make_targets = ""; + $make_targets .= " links" if $symlink; + $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend; diff --git a/dev-libs/openssl/openssl-0.9.8e-r3.ebuild b/dev-libs/openssl/openssl-0.9.8e-r3.ebuild index 0ef175d8a845..a306c935d65e 100644 --- a/dev-libs/openssl/openssl-0.9.8e-r3.ebuild +++ b/dev-libs/openssl/openssl-0.9.8e-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8e-r3.ebuild,v 1.2 2007/09/30 06:26:36 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8e-r3.ebuild,v 1.3 2007/09/30 12:08:21 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -37,6 +37,7 @@ src_unpack() { epatch "${FILESDIR}"/${PN}-0.9.8-evp-key-len.patch #168750 epatch "${FILESDIR}"/${PN}-0.9.8e-CVE-2007-3108.patch #188799 epatch "${FILESDIR}"/${PN}-0.9.8e-CVE-2007-5135.patch #194039 + epatch "${FILESDIR}"/${PN}-0.9.8e-make.patch #146316 [[ $(gcc-version) == "4.2" ]] && epatch "${FILESDIR}"/${PN}-0.9.8-gcc42.patch #158324 # allow openssl to be cross-compiled |