From 36f7be2c2f35bc408c38de611566fae0de0a3b58 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sat, 27 Jan 2018 13:01:44 +0100 Subject: [PATCH 1/1] We need Unixly defaults for config targets that don't inherit a BASE Ideally, each config target should inherit a base to get their platform specific defaults. Unfortunately, that is currently not the case, so we duplicate the Unixly defaults from the BASE_unix template into the DEFAULT template. Reviewed-by: Tim Hudson Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5177) --- Configurations/00-base-templates.conf | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index e24baf1f53..72cbde203f 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -38,10 +38,22 @@ my %targets=( shared_rcflag => "", shared_extension => "", - hashbangperl => "PERL", # Only Unix actually cares + #### Defaults for the benefit of the config targets who don't inherit + #### a BASE and assume Unixly defaults + #### THESE WILL DISAPPEAR IN OpenSSL 1.2 + build_scheme => [ "unified", "unix" ], + build_file => "Makefile", - build_scheme => [ "unified", "unix" ], - build_file => "Makefile", + ar => "ar", + arflags => "r", + cc => "cc", + hashbangperl => "/usr/bin/env perl", + ranlib => sub { which("$config{cross_compile_prefix}ranlib") ? + "\$(CROSS_COMPILE)ranlib" : "true"; }, + rc => "windres", + + #### THESE WILL BE ENABLED IN OpenSSL 1.2 + #hashbangperl => "PERL", # Only Unix actually cares }, BASE_common => { -- 2.34.1