diff options
| author | Richard Levitte <levitte@openssl.org> | 2017-12-01 15:29:05 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2017-12-12 17:18:07 +0100 |
| commit | 3b6c4b07364797566c2c1fd75e499b2d9dd73506 (patch) | |
| tree | e3b38e114678fc4512900c204aea0eae0fc55dfc /Configurations | |
| parent | cbade36108267fc551d0ec50d897a954b55672ac (diff) | |
Configure: Add read_eval_file, a general purpose perl file reader/evaluator
It will return the last expression from the input file.
We also use this in read_config, which slightly changes what's
expected of Configurations/*.conf. They do not have to assign
%targets specifically. On the other hand, the table of configs MUST
be the last expression in each of those files.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4840)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/00-base-templates.conf | 2 | ||||
| -rw-r--r-- | Configurations/10-main.conf | 2 | ||||
| -rw-r--r-- | Configurations/50-djgpp.conf | 2 | ||||
| -rw-r--r-- | Configurations/50-haiku.conf | 2 | ||||
| -rw-r--r-- | Configurations/50-masm.conf | 2 | ||||
| -rw-r--r-- | Configurations/90-team.conf | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index f2d7f6aade..ce59fbf296 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -1,5 +1,5 @@ # -*- Mode: perl -*- -%targets=( +my %targets=( DEFAULTS => { template => 1, diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 28cfd30021..0b07e81fd8 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -144,7 +144,7 @@ sub vms_info { return $vms_info; } -%targets = ( +my %targets = ( #### Basic configs that should work on any 32-bit box "gcc" => { diff --git a/Configurations/50-djgpp.conf b/Configurations/50-djgpp.conf index f532bd16f7..fa8e6625d8 100644 --- a/Configurations/50-djgpp.conf +++ b/Configurations/50-djgpp.conf @@ -2,7 +2,7 @@ # and rely entirely on the OpenSSL community to help is fine # tune and test. -%targets = ( +my %targets = ( "DJGPP" => { inherit_from => [ asm("x86_asm") ], cc => "gcc", diff --git a/Configurations/50-haiku.conf b/Configurations/50-haiku.conf index aea5b2b5cb..b57e148710 100644 --- a/Configurations/50-haiku.conf +++ b/Configurations/50-haiku.conf @@ -1,4 +1,4 @@ -%targets = ( +my %targets = ( "haiku-common" => { template => 1, cc => "cc", diff --git a/Configurations/50-masm.conf b/Configurations/50-masm.conf index 0ec5e95084..e2b54e345c 100644 --- a/Configurations/50-masm.conf +++ b/Configurations/50-masm.conf @@ -7,7 +7,7 @@ # proven to be daunting task. This is experimental target, for # production builds stick with [up-to-date version of] nasm. -%targets = ( +my %targets = ( "VC-WIN64A-masm" => { inherit_from => [ "VC-WIN64-common", asm("x86_64_asm"), sub { $disabled{shared} ? () : "x86_64_uplink" } ], diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf index beb6ad8661..4d57f3fe2f 100644 --- a/Configurations/90-team.conf +++ b/Configurations/90-team.conf @@ -1,7 +1,7 @@ ## -*- mode: perl; -*- ## Build configuration targets for openssl-team members -%targets = ( +my %targets = ( "purify" => { cc => "purify gcc", cflags => "-g -Wall", |