From a5250ec02f4d8b27d786c415ae882801972bfccd Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Thu, 12 Mar 2015 14:58:07 +0100 Subject: [PATCH] Configuration cleanup: personal configs Move obviously personal configurations to personal files. Note: those files should really not be in the main repo at all Reviewed-by: Andy Polyakov --- Configurations/90-team.conf | 214 ------------------------ Configurations/99-personal-ben.conf | 94 +++++++++++ Configurations/99-personal-bodo.conf | 23 +++ Configurations/99-personal-geoff.conf | 32 ++++ Configurations/99-personal-levitte.conf | 59 +++++++ Configurations/99-personal-rse.conf | 15 ++ Configurations/99-personal-steve.conf | 49 ++++++ 7 files changed, 272 insertions(+), 214 deletions(-) create mode 100644 Configurations/99-personal-ben.conf create mode 100644 Configurations/99-personal-bodo.conf create mode 100644 Configurations/99-personal-geoff.conf create mode 100644 Configurations/99-personal-levitte.conf create mode 100644 Configurations/99-personal-rse.conf create mode 100644 Configurations/99-personal-steve.conf diff --git a/Configurations/90-team.conf b/Configurations/90-team.conf index 66d1eae7a4..0e78a14a02 100644 --- a/Configurations/90-team.conf +++ b/Configurations/90-team.conf @@ -17,114 +17,6 @@ thread_cflag => "(unknown)", lflags => "-lefence", }, - "debug-ben" => { - cc => "gcc", - cflags => "$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe", - thread_cflag => "(unknown)", - }, - "debug-ben-openbsd" => { - cc => "gcc", - cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe", - thread_cflag => "(unknown)", - }, - "debug-ben-openbsd-debug" => { - cc => "gcc", - cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe", - thread_cflag => "(unknown)", - }, - "debug-ben-debug" => { - cc => "gcc", - cflags => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe", - thread_cflag => "(unknown)", - }, - "debug-ben-debug-64" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe", - thread_cflag => "${BSDthreads}", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "debug-ben-debug-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 -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe", - thread_cflag => "${BSDthreads}", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "debug-ben-debug-64-noopt" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe", - thread_cflag => "${BSDthreads}", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "bsd-gcc-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "debug-ben-macos" => { - cc => "cc", - cflags => "$gcc_devteam_warn -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe", - thread_cflag => "(unknown)", - }, - "debug-ben-no-opt" => { - cc => "gcc", - cflags => "-Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3", - thread_cflag => "(unknown)", - }, - "debug-ben-strict" => { - cc => "gcc", - cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe", - thread_cflag => "(unknown)", - }, - "debug-ben-darwin64" => { - inherit_from => [ "x86_64_asm" ], - cc => "cc", - cflags => "$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall", - thread_cflag => "-D_REENTRANT", - sys_id => "MACOSX", - lflags => "-Wl,-search_paths_first%", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "macosx", - dso_scheme => "dlfcn", - shared_target => "darwin-shared", - shared_cflag => "-fPIC -fno-common", - shared_ldflag => "-arch x86_64 -dynamiclib", - shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", - }, - "debug-rse" => { - inherit_from => [ "x86_elf_asm" ], - cc => "cc", - cflags => "-DL_ENDIAN -pipe -O -g -ggdb3 -Wall", - thread_cflag => "(unknown)", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", - }, - "debug-bodo" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - multilib => "64", - }, "debug-erbridge" => { inherit_from => [ "x86_64_asm" ], cc => "gcc", @@ -140,112 +32,6 @@ shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", multilib => "64", }, - "debug-steve64" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "debug-steve32" => { - inherit_from => [ "x86_elf_asm" ], - cc => "gcc", - cflags => "$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe", - thread_cflag => "-D_REENTRANT", - lflags => "-rdynamic -ldl", - bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m32", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "debug-steve-opt" => { - inherit_from => [ "x86_64_asm" ], - cc => "gcc", - cflags => "$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", - perlasm_scheme => "elf", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_ldflag => "-m64", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - - # Richard Levitte - "debug-levitte-linux-noasm" => { - inherit_from => [ "no_asm_filler" ], - cc => "gcc", - cflags => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT", - 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 -DCRYPTO_MDEBUG -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", - lflags => "-ldl", - bn_ops => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT", - 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" => { - inherit_from => [ "no_asm_filler" ], - cc => "gcc", - cflags => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -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", - lflags => "-ldl", - bn_ops => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT", - perlasm_scheme => "void", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - - "debug-geoff32" => { - inherit_from => [ "no_asm_filler" ], - cc => "gcc", - cflags => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "BN_LLONG", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, - "debug-geoff64" => { - inherit_from => [ "no_asm_filler" ], - cc => "gcc", - cflags => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long", - thread_cflag => "-D_REENTRANT", - lflags => "-ldl", - bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", - dso_scheme => "dlfcn", - shared_target => "linux-shared", - shared_cflag => "-fPIC", - shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", - }, "debug-linux-pentium" => { inherit_from => [ "x86_elf_asm" ], cc => "gcc", diff --git a/Configurations/99-personal-ben.conf b/Configurations/99-personal-ben.conf new file mode 100644 index 0000000000..94ea6d04ae --- /dev/null +++ b/Configurations/99-personal-ben.conf @@ -0,0 +1,94 @@ +## Personal configuration targets +## +## If you edit this file, run this command before committing +## make -f Makefile.org TABLE +## This file is interpolated by the Configure script. + +%targets = ( + "debug-ben" => { + cc => "gcc", + cflags => "$gcc_devteam_warn -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DDEBUG_SAFESTACK -O2 -pipe", + thread_cflag => "(unknown)", + }, + "debug-ben-openbsd" => { + cc => "gcc", + cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -O2 -pedantic -Wall -Wshadow -Werror -pipe", + thread_cflag => "(unknown)", + }, + "debug-ben-openbsd-debug" => { + cc => "gcc", + cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DOPENSSL_OPENBSD_DEV_CRYPTO -DOPENSSL_NO_ASM -g3 -O2 -pedantic -Wall -Wshadow -Werror -pipe", + thread_cflag => "(unknown)", + }, + "debug-ben-debug" => { + cc => "gcc", + cflags => "$gcc_devteam_warn -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DOPENSSL_NO_HW_PADLOCK -g3 -O2 -pipe", + thread_cflag => "(unknown)", + }, + "debug-ben-debug-64" => { + inherit_from => [ "x86_64_asm" ], + cc => "gcc", + cflags => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe", + thread_cflag => "${BSDthreads}", + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "bsd-gcc-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "debug-ben-debug-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 -Wstrict-overflow -Qunused-arguments -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -O3 -pipe", + thread_cflag => "${BSDthreads}", + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "bsd-gcc-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "debug-ben-debug-64-noopt" => { + inherit_from => [ "x86_64_asm" ], + cc => "gcc", + cflags => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -g3 -pipe", + thread_cflag => "${BSDthreads}", + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "bsd-gcc-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "debug-ben-macos" => { + cc => "cc", + cflags => "$gcc_devteam_warn -DOPENSSL_NO_ASM -DBN_DEBUG -DCONF_DEBUG -DDEBUG_SAFESTACK -DDEBUG_UNUSED -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -arch i386 -O3 -DL_ENDIAN -g3 -pipe", + thread_cflag => "(unknown)", + }, + "debug-ben-no-opt" => { + cc => "gcc", + cflags => " -Wall -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG -Werror -DL_ENDIAN -Wall -g3", + thread_cflag => "(unknown)", + }, + "debug-ben-strict" => { + cc => "gcc", + cflags => "-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe", + thread_cflag => "(unknown)", + }, + "debug-ben-darwin64" => { + inherit_from => [ "x86_64_asm" ], + cc => "cc", + cflags => "$gcc_devteam_warn -Wno-language-extension-token -Wno-extended-offsetof -arch x86_64 -O3 -DL_ENDIAN -DMD32_REG_T=int -Wall", + thread_cflag => "-D_REENTRANT", + sys_id => "MACOSX", + lflags => "-Wl,-search_paths_first%", + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", + perlasm_scheme => "macosx", + dso_scheme => "dlfcn", + shared_target => "darwin-shared", + shared_cflag => "-fPIC -fno-common", + shared_ldflag => "-arch x86_64 -dynamiclib", + shared_extension => ".\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib", + }, +); diff --git a/Configurations/99-personal-bodo.conf b/Configurations/99-personal-bodo.conf new file mode 100644 index 0000000000..c9a753417e --- /dev/null +++ b/Configurations/99-personal-bodo.conf @@ -0,0 +1,23 @@ +## Personal configuration targets +## +## If you edit this file, run this command before committing +## make -f Makefile.org TABLE +## This file is interpolated by the Configure script. + +%targets = ( + "debug-bodo" => { + inherit_from => [ "x86_64_asm" ], + cc => "gcc", + cflags => "$gcc_devteam_warn -Wno-error=overlength-strings -DBN_DEBUG -DBN_DEBUG_RAND -DCONF_DEBUG -DBIO_PAIR_DEBUG -m64 -DL_ENDIAN -DTERMIO -g -DMD32_REG_T=int", + thread_cflag => "-D_REENTRANT", + lflags => "-ldl", + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_ldflag => "-m64", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + multilib => "64", + }, +); diff --git a/Configurations/99-personal-geoff.conf b/Configurations/99-personal-geoff.conf new file mode 100644 index 0000000000..adf0990c7c --- /dev/null +++ b/Configurations/99-personal-geoff.conf @@ -0,0 +1,32 @@ +## Personal configuration targets +## +## If you edit this file, run this command before committing +## make -f Makefile.org TABLE +## This file is interpolated by the Configure script. + +%targets = ( + "debug-geoff32" => { + inherit_from => [ "no_asm_filler" ], + cc => "gcc", + cflags => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long", + thread_cflag => "-D_REENTRANT", + lflags => "-ldl", + bn_ops => "BN_LLONG", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "debug-geoff64" => { + inherit_from => [ "no_asm_filler" ], + cc => "gcc", + cflags => "-DBN_DEBUG -DBN_DEBUG_RAND -DBN_STRICT -DPURIFY -DOPENSSL_NO_DEPRECATED -DOPENSSL_NO_ASM -DOPENSSL_NO_INLINE_ASM -DL_ENDIAN -DTERMIO -DPEDANTIC -O1 -ggdb2 -Wall -Werror -Wundef -pedantic -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align -Wsign-compare -Wmissing-prototypes -Wmissing-declarations -Wno-long-long", + thread_cflag => "-D_REENTRANT", + lflags => "-ldl", + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, +); diff --git a/Configurations/99-personal-levitte.conf b/Configurations/99-personal-levitte.conf new file mode 100644 index 0000000000..18fbcdc81c --- /dev/null +++ b/Configurations/99-personal-levitte.conf @@ -0,0 +1,59 @@ +## Personal configuration targets +## +## If you edit this file, run this command before committing +## make -f Makefile.org TABLE +## This file is interpolated by the Configure script. + +%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 -DCRYPTO_MDEBUG-ggdb -g3", + thread_cflag => "-D_REENTRANT", + lflags => "-ldl", + bn_ops => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "debug-levitte-linux-noasm" => { + inherit_from => [ "no_asm_filler" ], + cc => "gcc", + cflags => "-DLEVITTE_DEBUG -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -ggdb -g3 -Wall", + thread_cflag => "-D_REENTRANT", + lflags => "-ldl", + bn_ops => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT", + 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 -DCRYPTO_MDEBUG -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", + lflags => "-ldl", + bn_ops => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT", + 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" => { + inherit_from => [ "no_asm_filler" ], + cc => "gcc", + cflags => "-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_DEBUG_RAND -DCRYPTO_MDEBUG -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", + lflags => "-ldl", + bn_ops => "BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT", + perlasm_scheme => "void", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, +); diff --git a/Configurations/99-personal-rse.conf b/Configurations/99-personal-rse.conf new file mode 100644 index 0000000000..e9318fc7b0 --- /dev/null +++ b/Configurations/99-personal-rse.conf @@ -0,0 +1,15 @@ +## Personal configuration targets +## +## If you edit this file, run this command before committing +## make -f Makefile.org TABLE +## This file is interpolated by the Configure script. + +%targets = ( + "debug-rse" => { + inherit_from => [ "x86_elf_asm" ], + cc => "cc", + cflags => "-DL_ENDIAN -pipe -O -g -ggdb3 -Wall", + thread_cflag => "(unknown)", + bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + }, +); diff --git a/Configurations/99-personal-steve.conf b/Configurations/99-personal-steve.conf new file mode 100644 index 0000000000..454b28318a --- /dev/null +++ b/Configurations/99-personal-steve.conf @@ -0,0 +1,49 @@ +## Personal configuration targets +## +## If you edit this file, run this command before committing +## make -f Makefile.org TABLE +## This file is interpolated by the Configure script. + +%targets = ( + "debug-steve64" => { + inherit_from => [ "x86_64_asm" ], + cc => "gcc", + cflags => "$gcc_devteam_warn -m64 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g", + thread_cflag => "-D_REENTRANT", + lflags => "-ldl", + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_ldflag => "-m64", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "debug-steve32" => { + inherit_from => [ "x86_elf_asm" ], + cc => "gcc", + cflags => "$gcc_devteam_warn -m32 -DL_ENDIAN -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g -pipe", + thread_cflag => "-D_REENTRANT", + lflags => "-rdynamic -ldl", + bn_ops => "BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_ldflag => "-m32", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, + "debug-steve-opt" => { + inherit_from => [ "x86_64_asm" ], + cc => "gcc", + cflags => "$gcc_devteam_warn -m64 -O3 -DL_ENDIAN -DTERMIO -DCONF_DEBUG -DDEBUG_SAFESTACK -Wno-overlength-strings -g", + thread_cflag => "-D_REENTRANT", + lflags => "-ldl", + bn_ops => "SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL", + perlasm_scheme => "elf", + dso_scheme => "dlfcn", + shared_target => "linux-shared", + shared_cflag => "-fPIC", + shared_ldflag => "-m64", + shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", + }, +); -- 2.25.1