X-Git-Url: https://git.openssl.org/?a=blobdiff_plain;f=Configurations%2F00-base-templates.conf;h=0d0f8b8a7f4a403d23a0e7a766e87d4a31aaf0a3;hb=d6baf09fe0c9efe4fe87e16fed088b9ce2b4c3f1;hp=566b89b83541f5ee0f38f1e9df26d4aca8e0a62e;hpb=e72769aa41c3f49e0f39f44de222fc5ac339e3e0;p=openssl.git

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 566b89b835..0d0f8b8a7f 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -1,14 +1,17 @@
 # -*- Mode: perl -*-
-%targets=(
+my %targets=(
     DEFAULTS => {
 	template	=> 1,
 
 	cflags		=> "",
+	cppflags	=> "",
+	lflags		=> "",
 	defines		=> [],
 	thread_scheme	=> "(unknown)", # Assume we don't know
 	thread_defines	=> [],
 
 	apps_aux_src	=> "",
+	apps_init_src	=> "",
 	cpuid_asm_src	=> "mem_clr.c",
 	uplink_aux_src	=> "",
 	bn_asm_src	=> "bn_asm.c",
@@ -36,12 +39,30 @@
 	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 => {
 	template	=> 1,
+
+	enable		=> [],
+	disable		=> [],
+
 	defines		=>
 	    sub {
                 my @defs = ();
@@ -55,18 +76,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",
@@ -80,10 +102,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",
@@ -112,7 +135,7 @@
 
     uplink_common => {
 	template	=> 1,
-	apps_aux_src	=> add("../ms/applink.c"),
+	apps_init_src	=> add("../ms/applink.c"),
 	uplink_aux_src	=> add("../ms/uplink.c"),
 	defines		=> add("OPENSSL_USE_APPLINK"),
     },
@@ -179,9 +202,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"
     },
@@ -216,7 +237,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",
     },
@@ -275,18 +296,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",
+
     },
 );