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

Fix a few Configure errors

Browse Source 
Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte
2016-03-14 10:02:13 +01:00
parent bae26b582e
commit 01d9997659
2 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Configurations/10-main.conf
View File

@@ -52,8 +52,9 @@ sub vc_wince_info {
my $wcelflag = "/subsystem:windowsce,$1.$2"; # ...,N.NN my $wcelflag = "/subsystem:windowsce,$1.$2"; # ...,N.NN
my $wceplatf = $ENV{'PLATFORM'}; my $wceplatf = $ENV{'PLATFORM'};
my $wceplatf =~ tr/a-z0-9 /A-Z0-9_/d;
my $wcecdefs .= " -DWCE_PLATFORM_$wceplatf"; $wceplatf =~ tr/a-z0-9 /A-Z0-9_/;
$wcecdefs .= " -DWCE_PLATFORM_$wceplatf";
my $wcetgt = $ENV{'TARGETCPU'}; # just shorter name... my $wcetgt = $ENV{'TARGETCPU'}; # just shorter name...
SWITCH: for($wcetgt) { SWITCH: for($wcetgt) {
@@ -532,10 +533,10 @@ sub vc_wince_info {
"hpux64-ia64-gcc" => { "hpux64-ia64-gcc" => {
inherit_from => [ "BASE_unix", asm("ia64_asm") ], inherit_from => [ "BASE_unix", asm("ia64_asm") ],
cc => "gcc", cc => "gcc",
cflags => picker(default => "-mlp64 -DB_ENDIAN", cflags => combine(picker(default => "-mlp64 -DB_ENDIAN",
debug => "-O0 -g", debug => "-O0 -g",
release => "-O3", release => "-O3"),
threads("-pthread")), threads("-pthread")),
ex_libs => add("-ldl"), ex_libs => add("-ldl"),
bn_ops => "SIXTY_FOUR_BIT_LONG", bn_ops => "SIXTY_FOUR_BIT_LONG",
thread_scheme => "pthreads", thread_scheme => "pthreads",

13
Configure
View File

@@ -1,11 +1,7 @@
#! /usr/bin/env perl #! /usr/bin/env perl
# -*- mode: perl; -*- # -*- mode: perl; -*-
##
## Configure -- OpenSSL source tree configuration script ## Configure -- OpenSSL source tree configuration script
## If editing this file, run this command before committing
## make -f Makefile.in TABLE
##
require 5.000; require 5.000;
use strict; use strict;
@@ -202,7 +198,6 @@ foreach (sort glob($pattern) ) {
print "Configuring OpenSSL version $config{version} (0x$config{version_num})\n"; print "Configuring OpenSSL version $config{version} (0x$config{version_num})\n";
$config{perl};
$config{prefix}=""; $config{prefix}="";
$config{openssldir}=""; $config{openssldir}="";
$config{processor}=""; $config{processor}="";
@@ -746,7 +741,7 @@ while (@tocheckfor) {
my ($test, $descendents) = (shift @cascade_copy, shift @cascade_copy); my ($test, $descendents) = (shift @cascade_copy, shift @cascade_copy);
if (ref($test) eq "CODE" ? $test->() : defined($disabled{$test})) { if (ref($test) eq "CODE" ? $test->() : defined($disabled{$test})) {
map { map {
$new_tocheckfor{$_} => 1; $disabled{$_} = "forced"; $new_tocheckfor{$_} = 1; $disabled{$_} = "forced";
} grep { !defined($disabled{$_}) } @$descendents; } grep { !defined($disabled{$_}) } @$descendents;
} }
} }
@@ -1153,7 +1148,7 @@ die "Exactly one of SIXTY_FOUR_BIT|SIXTY_FOUR_BIT_LONG|THIRTY_TWO_BIT can be set
# "Stringify" the C flags string. This permits it to be made part of a string # "Stringify" the C flags string. This permits it to be made part of a string
# and works as well on command lines. # and works as well on command lines.
$config{cflags} =~ s/([\\\"])/\\\1/g; $config{cflags} =~ s/([\\\"])/\\$1/g;
if (defined($config{api})) { if (defined($config{api})) {
$config{openssl_api_defines} = [ "OPENSSL_MIN_API=".$apitable->{$config{api}} ]; $config{openssl_api_defines} = [ "OPENSSL_MIN_API=".$apitable->{$config{api}} ];
@@ -1798,7 +1793,7 @@ print "SIXTY_FOUR_BIT_LONG mode\n" if $config{b64l};
print "SIXTY_FOUR_BIT mode\n" if $config{b64}; print "SIXTY_FOUR_BIT mode\n" if $config{b64};
print "THIRTY_TWO_BIT mode\n" if $config{b32}; print "THIRTY_TWO_BIT mode\n" if $config{b32};
print "BN_LLONG mode\n" if $config{bn_ll}; print "BN_LLONG mode\n" if $config{bn_ll};
print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} != $def_int; print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} ne $def_int;
for (@generated_headers) { for (@generated_headers) {
mkpath(catdir($blddir, dirname($_))); mkpath(catdir($blddir, dirname($_)));
@@ -2210,7 +2205,7 @@ sub usage
exit(1); exit(1);
} }
sub run_dofile() sub run_dofile
{ {
my $out = shift; my $out = shift;
my @templates = @_; my @templates = @_;