Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-libs/openssl/files: openssl-0.9.8e-make.patch
Date: Sun, 30 Sep 2007 12:17:14
Message-Id: E1Ibxaw-0001Hg-6W@stork.gentoo.org
1 vapier 07/09/30 12:08:22
2
3 Added: openssl-0.9.8e-make.patch
4 Log:
5 Fix building on Gentoo/BSD setups where `make` != `$MAKE` #146316.
6 (Portage version: 2.1.3.9)
7
8 Revision Changes Path
9 1.1 dev-libs/openssl/files/openssl-0.9.8e-make.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/files/openssl-0.9.8e-make.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/openssl/files/openssl-0.9.8e-make.patch?rev=1.1&content-type=text/plain
13
14 Index: openssl-0.9.8e-make.patch
15 ===================================================================
16 respect $MAKE if it is set in the environment so we don't get a mix
17 of the host `make` and whatever $MAKE is set to when recursing
18
19 http://bugs.gentoo.org/146316
20
21 --- openssl-0.9.8e/Configure
22 +++ openssl-0.9.8e/Configure
23 @@ -931,6 +931,7 @@
24 $default_ranlib= &which("ranlib") or $default_ranlib="true";
25 $perl=$ENV{'PERL'} or $perl=&which("perl5") or $perl=&which("perl")
26 or $perl="perl";
27 +my $make = $ENV{'MAKE'} || "make";
28
29 chop $openssldir if $openssldir =~ /\/$/;
30 chop $prefix if $prefix =~ /\/$/;
31 @@ -1554,7 +1557,7 @@
32 EOF
33 close(OUT);
34 } else {
35 - my $make_command = "make PERL=\'$perl\'";
36 + my $make_command = "$make PERL=\'$perl\'";
37 my $make_targets = "";
38 $make_targets .= " links" if $symlink;
39 $make_targets .= " depend" if $depflags ne $default_depflags && $make_depend;
40
41
42
43 --
44 gentoo-commits@g.o mailing list