generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the Configure option --classic, to fall back on classic build schemes

Browse Source 
Reviewed-by: Matt Caswell <matt@openssl.org>
This commit is contained in:
Richard Levitte
2016-03-07 20:41:39 +01:00
parent 39b25ee244
commit dc3365f729
1 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Configure
View File

@@ -448,6 +448,8 @@ my $target="";
$config{options}=""; $config{options}="";
$config{build_type} = "release"; $config{build_type} = "release";
my $classic = 0;
my @argvcopy=@ARGV; my @argvcopy=@ARGV;
if (grep /^reconf(igure)?$/, @argvcopy) { if (grep /^reconf(igure)?$/, @argvcopy) {
@@ -631,7 +633,11 @@ foreach (@argvcopy)
} }
elsif (/^[-+]/) elsif (/^[-+]/)
{ {
if (/^--prefix=(.*)$/) if (/^--classic$/)
{
$classic=1;
}
elsif (/^--prefix=(.*)$/)
{ {
$config{prefix}=$1; $config{prefix}=$1;
die "Directory given with --prefix MUST be absolute\n" die "Directory given with --prefix MUST be absolute\n"
@@ -886,6 +892,22 @@ $config{shared_ldflag} = "";
$target{build_scheme} = [ $target{build_scheme} ] $target{build_scheme} = [ $target{build_scheme} ]
if ref($target{build_scheme}) ne "ARRAY"; if ref($target{build_scheme}) ne "ARRAY";
###### TO BE REMOVED WHEN CLASSIC BUILD IS REMOVED
######
###### If the user has chosen --classic, we give it to them.
###### If they try that with an out-of-source config, we complain.
if ($target{build_scheme}->[0] eq "unified" && $classic) {
die "Can't perform a classic build out of source tree\n"
if $srcdir ne $blddir;
$target{build_scheme} = { unix => [ "unixmake" ],
windows => [ "mk1mf", $target{build_scheme}->[2] ],
VMS => undef } -> {$target{build_scheme}->[1]};
die "Classic mode unavailable on this platform\n"
unless defined($target{build_scheme});
}
my ($builder, $builder_platform, @builder_opts) = my ($builder, $builder_platform, @builder_opts) =
@{$target{build_scheme}}; @{$target{build_scheme}};