Commit d76117b9 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5177)
parent 36f7be2c

Configurations/10-main.conf

+2 −0
Original line number Diff line number Diff line
@@ -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)",

Configurations/90-team.conf

+9 −5
Original line number Diff line number Diff line
@@ -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}")),