Processing GNU-style "make variables" - implementation

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

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 515cf00e20af867a67ee6deeeeffd40599e32c47..1a2964520ab3b17b7ed790c41b3d441b444e98a7 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  => [],
@@ -42,6 +44,10 @@
 
     BASE_common => {
        template        => 1,
+
+       enable          => [],
+       disable         => [],
+
        defines         =>
            sub {
                 my @defs = ();
@@ -55,18 +61,12 @@
         inherit_from    => [ "BASE_common" ],
         template        => 1,
 
+        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" : () },
 
         build_scheme    => [ "unified", "unix" ],
         build_file      => "Makefile",
@@ -80,10 +80,11 @@
             sub {
                 unless ($disabled{zlib}) {
                     if (defined($disabled{"zlib-dynamic"})) {
-                        return $withargs{zlib_lib};
+                        return $withargs{zlib_lib} // "ZLIB1";
                     }
                 }
-                return (); },
+                return ();
+            },
 
         ld              => "link",
         lflags          => "/nologo",
@@ -91,6 +92,12 @@
         ar              => "lib",
         arflags         => "/nologo",
         aroutflag       => "/out:",
+        rc               => "rc",
+        rcoutflag        => "/fo",
+        mt              => "mt",
+        mtflags         => "-nologo",
+        mtinflag        => "-manifest ",
+        mtoutflag       => "-outputresource:",
 
         build_file      => "makefile",
         build_scheme    => [ "unified", "windows" ],
@@ -173,9 +180,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"
     },
@@ -210,7 +215,7 @@
     },
     mips32_asm => {
        template        => 1,
-       bn_asm_src      => "bn-mips.s mips-mont.s",
+       bn_asm_src      => "bn-mips.S mips-mont.S",
        aes_asm_src     => "aes_cbc.c aes-mips.S",
        sha1_asm_src    => "sha1-mips.S sha256-mips.S",
     },
@@ -269,18 +274,20 @@
        inherit_from    => [ "parisc11_asm" ],
        perlasm_scheme  => "64",
     },
-    ppc64_asm => {
+    ppc32_asm => {
        template        => 1,
        cpuid_asm_src   => "ppccpuid.s ppccap.c",
-       bn_asm_src      => "bn-ppc.s ppc-mont.s ppc64-mont.s",
+       bn_asm_src      => "bn-ppc.s ppc-mont.s",
        aes_asm_src     => "aes_core.c aes_cbc.c aes-ppc.s vpaes-ppc.s aesp8-ppc.s",
        sha1_asm_src    => "sha1-ppc.s sha256-ppc.s sha512-ppc.s sha256p8-ppc.s sha512p8-ppc.s",
        modes_asm_src   => "ghashp8-ppc.s",
        chacha_asm_src  => "chacha-ppc.s",
        poly1305_asm_src=> "poly1305-ppc.s poly1305-ppcfp.s",
     },
-    ppc32_asm => {
-       inherit_from    => [ "ppc64_asm" ],
-       template        => 1
+    ppc64_asm => {
+       inherit_from    => [ "ppc32_asm" ],
+       template        => 1,
+       ec_asm_src      => "ecp_nistz256.c ecp_nistz256-ppc64.s",
+
     },
 );