We need Unixly defaults for config targets that don't inherit a BASE
authorRichard Levitte <levitte@openssl.org>
Sat, 27 Jan 2018 12:01:44 +0000 (13:01 +0100)
committerRichard Levitte <levitte@openssl.org>
Sun, 28 Jan 2018 06:26:11 +0000 (07:26 +0100)
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 <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5177)

Configurations/00-base-templates.conf

index e24baf1..72cbde2 100644 (file)
@@ -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 => {