Commit 3b6c4b07 authored Dec 01, 2017 by Richard Levitte

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)

parent cbade361

Configurations/00-base-templates.conf

+1 −1

Original line number	Diff line number	Diff line
		# -- Mode: perl --
		%targets=(
		my %targets=(
		DEFAULTS => {
		template => 1,

Configurations/10-main.conf

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ sub vms_info {
		return $vms_info;
		}

		%targets = (
		my %targets = (

		#### Basic configs that should work on any 32-bit box
		"gcc" => {

Configurations/50-djgpp.conf

+1 −1

Original line number	Diff line number	Diff line
		@@ -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",

Configurations/50-haiku.conf

+1 −1

Original line number	Diff line number	Diff line
		%targets = (
		my %targets = (
		"haiku-common" => {
		template => 1,
		cc => "cc",

Configurations/50-masm.conf

+1 −1

Original line number	Diff line number	Diff line
		@@ -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" } ],