We need Unixly defaults for config targets that don't inherit a BASE

[openssl.git] / Configurations / 00-base-templates.conf

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 84f71442c16aa97c04fcc8472622e995eb787697..72cbde203fc72deaa6791ae6bfa6c4c3eea6ef31 100644 (file)
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -1,9 +1,11 @@
 # -*- Mode: perl -*-
-%targets=(
+my %targets=(
     DEFAULTS => {
        template        => 1,
 
        cflags          => "",
+       cppflags        => "",
+       lflags          => "",
        defines         => [],
        thread_scheme   => "(unknown)", # Assume we don't know
        thread_defines  => [],
@@ -36,8 +38,22 @@
        shared_rcflag   => "",
        shared_extension        => "",
 
-        build_scheme    => [ "unified", "unix" ],
-        build_file      => "Makefile",
+       #### 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",
+
+       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 => {
@@ -59,18 +75,19 @@
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
+        ar              => "ar",
+        arflags         => "r",
+        cc              => "cc",
+        lflags          =>
+            sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () },
         ex_libs         =>
-            sub {
-                unless ($disabled{zlib}) {
-                    if (defined($disabled{"zlib-dynamic"})) {
-                        if (defined($withargs{zlib_lib})) {
-                            return "-L".$withargs{zlib_lib}." -lz";
-                        } else {
-                            return "-lz";
-                        }
-                    }
-                }
-                return (); },
+            sub { !defined($disabled{zlib})
+                  && defined($disabled{"zlib-dynamic"})
+                  ? "-lz" : () },
+        hashbangperl    => "/usr/bin/env perl", # Only Unix actually cares
+        ranlib          => sub { which("$config{cross_compile_prefix}ranlib") ?
+                                     "\$(CROSS_COMPILE)ranlib" : "true"; },
+        rc              => "windres",
 
         build_scheme    => [ "unified", "unix" ],
         build_file      => "Makefile",
@@ -184,9 +201,7 @@
        cpuid_asm_src   => "ia64cpuid.s",
        bn_asm_src      => "bn-ia64.s ia64-mont.s",
        aes_asm_src     => "aes_core.c aes_cbc.c aes-ia64.s",
-       md5_asm_src     => "md5-ia64.s",
        sha1_asm_src    => "sha1-ia64.s sha256-ia64.s sha512-ia64.s",
-       rc4_asm_src     => "rc4-ia64.s rc4_skey.c",
        modes_asm_src   => "ghash-ia64.s",
        perlasm_scheme  => "void"
     },