From: Richard Levitte <levitte@openssl.org>
Date: Sat, 27 Jan 2018 12:06:39 +0000 (+0100)
Subject: Make sure all our config targets inherit a BASE template
X-Git-Tag: OpenSSL_1_1_1-pre1~115
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d76117b9ad9105f179fe6f1e77c5d31cb668019c;p=oweals%2Fopenssl.git

Make sure all our config targets inherit a BASE template

There were a small number that inherited no BASE, the now inherit
BASE_unix.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5177)
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index e773563dab..21b4f3b2c4 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -148,6 +148,7 @@ my %targets = (
 
 #### Basic configs that should work on any 32-bit box
     "gcc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "gcc",
         cflags           => picker(debug   => "-O0 -g",
                                    release => "-O3"),
@@ -155,6 +156,7 @@ my %targets = (
         bn_ops           => "BN_LLONG",
     },
     "cc" => {
+        inherit_from     => [ "BASE_unix" ],
         cc               => "cc",
         cflags           => "-O",
         thread_scheme    => "(unknown)",
diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf
index 4d57f3fe2f..31382182f0 100644
--- a/Configurations/90-team.conf
+++ b/Configurations/90-team.conf
@@ -3,18 +3,20 @@
 
 my %targets = (
     "purify" => {
+        inherit_from     => [ 'BASE_unix' ],
         cc               => "purify gcc",
         cflags           => "-g -Wall",
         thread_scheme    => "(unknown)",
         ex_libs          => add(" ","-lsocket -lnsl"),
     },
     "debug" => {
+        inherit_from     => [ 'BASE_unix' ],
         cc               => "gcc",
         cflags           => "-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror",
         thread_scheme    => "(unknown)",
     },
     "debug-erbridge" => {
-        inherit_from     => [ "x86_64_asm" ],
+        inherit_from     => [ 'BASE_unix', "x86_64_asm" ],
         cc               => "gcc",
         cflags           => combine("$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g",
                                     threads("-D_REENTRANT")),
@@ -30,7 +32,7 @@ my %targets = (
         multilib         => "64",
     },
     "debug-linux-pentium" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ 'BASE_unix', "x86_elf_asm" ],
         cc               => "gcc",
         cflags           => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall",
                                     threads("-D_REENTRANT")),
@@ -40,7 +42,7 @@ my %targets = (
         dso_scheme       => "dlfcn",
     },
     "debug-linux-ppro" => {
-        inherit_from     => [ "x86_elf_asm" ],
+        inherit_from     => [ 'BASE_unix', "x86_elf_asm" ],
         cc               => "gcc",
         cflags           => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall",
                                     threads("-D_REENTRANT")),
@@ -50,6 +52,7 @@ my %targets = (
         dso_scheme       => "dlfcn",
     },
     "debug-linux-ia32-aes" => {
+        inherit_from     => [ 'BASE_unix' ],
         cc               => "gcc",
         cflags           => combine("-DL_ENDIAN -O3 -fomit-frame-pointer -Wall",
                                     threads("-D_REENTRANT")),
@@ -77,12 +80,13 @@ my %targets = (
         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
     },
     "dist" => {
+        inherit_from     => [ 'BASE_unix' ],
         cc               => "cc",
         cflags           => "-O",
         thread_scheme    => "(unknown)",
     },
     "debug-test-64-clang" => {
-        inherit_from     => [ "x86_64_asm" ],
+        inherit_from     => [ 'BASE_unix', "x86_64_asm" ],
         cc               => "clang",
         cflags           => combine("$gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
                                     threads("${BSDthreads}")),
@@ -95,7 +99,7 @@ my %targets = (
         shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
     },
     "darwin64-debug-test-64-clang" => {
-        inherit_from     => [ "x86_64_asm" ],
+        inherit_from     => [ 'BASE_unix', "x86_64_asm" ],
         cc               => "clang",
         cflags           => combine("-arch x86_64 -DL_ENDIAN $gcc_devteam_warn -Wno-error=overlength-strings -Wno-error=extended-offsetof -Wno-error=language-extension-token -Wno-error=unused-const-variable -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe",
                                     threads("${BSDthreads}")),