Fix building on Gentoo/BSD setups where `make` != `$MAKE` #146316.

Package-Manager: portage-2.1.3.9

4 files changed, 57 insertions, 10 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/Manifest b/dev-libs/openssl/Manifest
index 96968397379d..44078809ce3d 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gentoo.config-0.9.7g 3356 RMD160 8e83cecd44f2dc6b0863bf10b920cae2490250d7 SHA1 9dc82ecc34677b9b9f2758d3c86ae5a8b4d86720 SHA256 1935ea31cf0d4c4a7f5ed0fa4434e9960c7ccef5cb43abcee26cff09472991eb
 MD5 5479124566140e079c2493abe59a1c90 files/gentoo.config-0.9.7g 3356
 RMD160 8e83cecd44f2dc6b0863bf10b920cae2490250d7 files/gentoo.config-0.9.7g 3356
@@ -90,6 +93,10 @@ AUX openssl-0.9.8e-CVE-2007-5135.patch 1171 RMD160 286cde7971b02dd029dd2156d3267
 MD5 31808a772e2aceff10746749ea0e14ba files/openssl-0.9.8e-CVE-2007-5135.patch 1171
 RMD160 286cde7971b02dd029dd2156d326766c06c82cb9 files/openssl-0.9.8e-CVE-2007-5135.patch 1171
 SHA256 cbc6fa2d2a91be595f2eb73d935871ed05dd0a6ac2c53d794192d724cc5b2237 files/openssl-0.9.8e-CVE-2007-5135.patch 1171
+AUX openssl-0.9.8e-make.patch 794 RMD160 2a99f48ef103fa369cc8c513efcc0330eb855b7d SHA1 b6b93f6db5f6519312b35df268eab51c2c3ca988 SHA256 f318fdebb6e035185c2bba2513ceac81f5cd229c1426e16ea4faed528f7795be
+MD5 825c2fb6c6ae5bab7bc2dd203eff7bc6 files/openssl-0.9.8e-make.patch 794
+RMD160 2a99f48ef103fa369cc8c513efcc0330eb855b7d files/openssl-0.9.8e-make.patch 794
+SHA256 f318fdebb6e035185c2bba2513ceac81f5cd229c1426e16ea4faed528f7795be files/openssl-0.9.8e-make.patch 794
 DIST openssl-0.9.7l.tar.gz 3294357 RMD160 11cc0299cef6bcc4adb9e9a39214f7d9f8abf77d SHA1 f0e4136639b10cbd1227c4f7350ff7ad406e575d SHA256 7ed19859c92e1c13e9f8ed5c3de35c3d48e45bff1b52ffc43845cc0c856fa3d1
 DIST openssl-0.9.7m.tar.gz 3303943 RMD160 fed13325d90ae4749d7ee858931d6925c3955614 SHA1 546f6bcebdf72a633bad087469d3741a42f7b383 SHA256 c98b9703887e2dda6217b91405d0d94883f7c67e205fc4d7a81bb690d2e10572
 DIST openssl-0.9.8d.tar.gz 3315566 RMD160 f2eb6c266009bbbdbdc7f01b6238c55b3fe12073 SHA1 4136fba00303a3d319d2052bfa8e1f09a2e12fc2 SHA256 022194944cc20dad917c86c916db8a4e0050df2de91b9b6740ddd4fb2daf175d
@@ -114,18 +121,22 @@ EBUILD openssl-0.9.8e-r2.ebuild 5489 RMD160 6c5d1f7e5516bab5ba6547b1eece69958604
 MD5 d399d55ce7f5247c6639c0e55db4e919 openssl-0.9.8e-r2.ebuild 5489
 RMD160 6c5d1f7e5516bab5ba6547b1eece6995860432aa openssl-0.9.8e-r2.ebuild 5489
 SHA256 7689d5f33aeb0444950379b9249679d2c0d88e0efa95e75e4bb353040279694f openssl-0.9.8e-r2.ebuild 5489
-EBUILD openssl-0.9.8e-r3.ebuild 5563 RMD160 8f5f14f3a93f23181ce95ad188682d9a838fb1cb SHA1 ed49e1c1405db744ee6ca9b98aba8869fdbec67e SHA256 431285e8a4f96e09006e71d9c9356824747a2e7c382260aca84ed5178ee379dc
-MD5 20d81a7f82eba30a95ccebbd6f8a6999 openssl-0.9.8e-r3.ebuild 5563
-RMD160 8f5f14f3a93f23181ce95ad188682d9a838fb1cb openssl-0.9.8e-r3.ebuild 5563
-SHA256 431285e8a4f96e09006e71d9c9356824747a2e7c382260aca84ed5178ee379dc openssl-0.9.8e-r3.ebuild 5563
+EBUILD openssl-0.9.8e-r3.ebuild 5616 RMD160 2a8e9910743ab7a1a99f3343f538d18db16bea24 SHA1 0a4d2e54b17d471df4c6838d4b20382beae4b53a SHA256 b94f07cbfb853fe516c78746966de106b4eb820e53b0a082267097630cd7e105
+MD5 596085760dceef6f1ff6196a922b7b3c openssl-0.9.8e-r3.ebuild 5616
+RMD160 2a8e9910743ab7a1a99f3343f538d18db16bea24 openssl-0.9.8e-r3.ebuild 5616
+SHA256 b94f07cbfb853fe516c78746966de106b4eb820e53b0a082267097630cd7e105 openssl-0.9.8e-r3.ebuild 5616
 EBUILD openssl-0.9.8e.ebuild 5287 RMD160 bceec651c3529487b13619e94919237039f477e4 SHA1 66639a4c879c53e1221873d5c611a449cc6ba213 SHA256 ad0c7b432865ee6a27dbd0762ca08139c4a03246531e4c8c782a0aced4442ac4
 MD5 73195a49e002fc41fade181a9e5d3b92 openssl-0.9.8e.ebuild 5287
 RMD160 bceec651c3529487b13619e94919237039f477e4 openssl-0.9.8e.ebuild 5287
 SHA256 ad0c7b432865ee6a27dbd0762ca08139c4a03246531e4c8c782a0aced4442ac4 openssl-0.9.8e.ebuild 5287
-MISC ChangeLog 33922 RMD160 001d7abeea883288f3746edd0dc357ab5c39cdec SHA1 d39b20aac3ba1221fedeca383668522a248c247f SHA256 0423d1fdea91aca44c1cc00f66b4b8852592abea7518903200c624a8ce4498f0
-MD5 6a310db999237306c47983881946d0ae ChangeLog 33922
-RMD160 001d7abeea883288f3746edd0dc357ab5c39cdec ChangeLog 33922
-SHA256 0423d1fdea91aca44c1cc00f66b4b8852592abea7518903200c624a8ce4498f0 ChangeLog 33922
+MISC ChangeLog 34103 RMD160 6b2ec87cb8ef0ace94bc2dc95204f0a91c61a9ea SHA1 1c40e2dfd6b491402517b10dc84234bb1bd61251 SHA256 23b51aee69f0f83f6bcb4db32edc92608bf128afb192a881c7e6fa2f414c1f90
+MD5 69cbefac983b3bd2978fe986a59407a4 ChangeLog 34103
+RMD160 6b2ec87cb8ef0ace94bc2dc95204f0a91c61a9ea ChangeLog 34103
+SHA256 23b51aee69f0f83f6bcb4db32edc92608bf128afb192a881c7e6fa2f414c1f90 ChangeLog 34103
+MISC bindresport.o 1848 RMD160 1a62e51c343adfb9343af774dd18df0668f99147 SHA1 bc52ab3b819de17d7fba616770a4231b86c2a95c SHA256 11c183fcd6a67581444d4b1e07c8927eb00f7dd21a1a2e0bc0b32100165838be
+MD5 c4c2870cefd9746220ec6ea2bb5e0ab4 bindresport.o 1848
+RMD160 1a62e51c343adfb9343af774dd18df0668f99147 bindresport.o 1848
+SHA256 11c183fcd6a67581444d4b1e07c8927eb00f7dd21a1a2e0bc0b32100165838be bindresport.o 1848
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -151,3 +162,10 @@ SHA256 2805d899eece0f11f31ca624c548ed874c31daaddf922044a6586a3ad2aad00a files/di
 MD5 b7beba1f496f9ed591d246ccb3986805 files/digest-openssl-0.9.8e-r3 247
 RMD160 70d9be870635c3015dcea57e013ad2017c44f878 files/digest-openssl-0.9.8e-r3 247
 SHA256 2805d899eece0f11f31ca624c548ed874c31daaddf922044a6586a3ad2aad00a files/digest-openssl-0.9.8e-r3 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFG/5G7p/wUKkr7RBoRAoZTAJ98A/ZfIHAqaT+wWQMPZuaYCbnNxQCgndBX
+IpVdWsc1BLFpGKl7EX7DikA=
+=8UNb
+-----END PGP SIGNATURE-----
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