From 8ffdf7ffd7b649068521c635baa2d0a9fd89914a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 29 Jan 2016 23:36:12 +0100 Subject: [PATCH] unified build scheme: add a personal configuration to test it Nothing else will run the unified scheme for now. Reviewed-by: Andy Polyakov --- Configurations/99-personal-levitte.conf | 55 ++++--------------------- 1 file changed, 9 insertions(+), 46 deletions(-) diff --git a/Configurations/99-personal-levitte.conf b/Configurations/99-personal-levitte.conf index 75a0750aeb..d28cc6e934 100644 --- a/Configurations/99-personal-levitte.conf +++ b/Configurations/99-personal-levitte.conf @@ -7,52 +7,15 @@ %targets = ( "levitte-linux-elf" => { - inherit_from => [ "x86_elf_asm" ], - cc => "gcc", - cflags => "-DL_ENDIAN -Wall", - debug_cflags => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -ggdb -g3", - 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)", + inherit_from => [ "linux-elf" ], + debug_cflags => add("-DLEVITTE_DEBUG -ggdb -g3"), + build_scheme => [ "unified", "unix" ], + build_file => "Makefile", }, - "debug-levitte-linux-noasm" => { - cc => "gcc", - cflags => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -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-levitte-linux-elf-extreme" => { - inherit_from => [ "x86_elf_asm" ], - cc => "gcc", - cflags => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DENGINE_CONF_DEBUG -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe", - thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", - bn_ops => "BN_LLONG", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "debug-levitte-linux-noasm-extreme" => { - cc => "gcc", - cflags => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DENGINE_CONF_DEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DPEDANTIC -ggdb -g3 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -Wundef -Wconversion -pipe", - thread_cflag => "-D_REENTRANT", - ex_libs => "-ldl", - bn_ops => "BN_LLONG", - perlasm_scheme => "void", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + "levitte-linux-x86_64" => { + inherit_from => [ "linux-x86_64" ], + debug_cflags => add("-DLEVITTE_DEBUG -ggdb -g3"), + build_scheme => [ "unified", "unix" ], + build_file => "Makefile", }, );