X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Configurations%2F90-team.conf;h=0a83c22aaa1ebcc696110e78b728bb72c28def05;hb=f02ec65590ef38444e80f595ebdbd211a25b4738;hp=bb24bdb71764575996dcdee60359c215157a01ca;hpb=9fe2bb77c40f5fd3624b30f1b0c3cd8b791ca615;p=oweals%2Fopenssl.git diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf index bb24bdb717..0a83c22aaa 100644 --- a/Configurations/90-team.conf +++ b/Configurations/90-team.conf @@ -1,30 +1,26 @@ ## -*- mode: perl; -*- ## Build configuration targets for openssl-team members -## -## If you edit this file, run this command before committing -## make -f Makefile.in TABLE -## This file is interpolated by the Configure script. %targets = ( "purify" => { cc => "purify gcc", cflags => "-g -Wall", - thread_cflag => "(unknown)", - ex_libs => "-lsocket -lnsl", + thread_scheme => "(unknown)", + ex_libs => add(" ","-lsocket -lnsl"), }, "debug" => { cc => "gcc", - cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror", - thread_cflag => "(unknown)", - ex_libs => "-lefence", + 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" ], cc => "gcc", - cflags => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g", - thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", + cflags => combine("$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -m64 -DL_ENDIAN -DTERMIO -g", + threads("-D_REENTRANT")), + ex_libs => add(" ","-ldl"), bn_ops => "SIXTY_FOUR_BIT_LONG", + thread_scheme => "pthreads", perlasm_scheme => "elf", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -36,38 +32,28 @@ "debug-linux-pentium" => { inherit_from => [ "x86_elf_asm" ], cc => "gcc", - cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall", - thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", + cflags => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentium -Wall", + threads("-D_REENTRANT")), + ex_libs => add(" ","-ldl"), bn_ops => "BN_LLONG", + thread_scheme => "pthreads", dso_scheme => "dlfcn", }, "debug-linux-ppro" => { inherit_from => [ "x86_elf_asm" ], cc => "gcc", - cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall", - thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", + cflags => combine("-DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -mcpu=pentiumpro -Wall", + threads("-D_REENTRANT")), + ex_libs => add(" ","-ldl"), bn_ops => "BN_LLONG", + thread_scheme => "pthreads", dso_scheme => "dlfcn", }, - "debug-linux-elf-noefence" => { - inherit_from => [ "x86_elf_asm" ], - cc => "gcc", - cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DL_ENDIAN -g -march=i486 -Wall", - thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", - bn_ops => "BN_LLONG", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, "debug-linux-ia32-aes" => { cc => "gcc", - cflags => "-DAES_EXPERIMENTAL -DL_ENDIAN -O3 -fomit-frame-pointer -Wall", - thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", + cflags => combine("-DL_ENDIAN -O3 -fomit-frame-pointer -Wall", + threads("-D_REENTRANT")), + ex_libs => add(" ","-ldl"), bn_ops => "BN_LLONG", cpuid_asm_src => "x86cpuid.s", bn_asm_src => "bn-586.s co-586.s x86-mont.s", @@ -83,6 +69,7 @@ wp_asm_src => "wp_block.s wp-mmx.s", modes_asm_src => "ghash-x86.s", padlock_asm_src => "e_padlock-x86.s", + thread_scheme => "pthreads", perlasm_scheme => "elf", dso_scheme => "dlfcn", shared_target => "linux-shared", @@ -92,14 +79,15 @@ "dist" => { cc => "cc", cflags => "-O", - thread_cflag => "(unknown)", + thread_scheme => "(unknown)", }, "debug-test-64-clang" => { inherit_from => [ "x86_64_asm" ], cc => "clang", - cflags => "$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", - thread_cflag => "${BSDthreads}", + 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}")), bn_ops => "SIXTY_FOUR_BIT_LONG", + thread_scheme => "pthreads", perlasm_scheme => "elf", dso_scheme => "dlfcn", shared_target => "bsd-gcc-shared", @@ -109,10 +97,11 @@ "darwin64-debug-test-64-clang" => { inherit_from => [ "x86_64_asm" ], cc => "clang", - cflags => "-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", - thread_cflag => "${BSDthreads}", + 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}")), sys_id => "MACOSX", bn_ops => "SIXTY_FOUR_BIT_LONG", + thread_scheme => "pthreads", perlasm_scheme => "macosx", dso_scheme => "dlfcn", shared_target => "darwin-shared",