wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix use of add() and add_before() in Configurations/*.conf

Browse source 
These two functions take a separator to concatenat the strings with as
first argument.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-16 02:48:18 +01:00
parent c4fb3b3942
commit b0c93ee747
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configurations/00-base-templates.conf
View file

@ -132,7 +132,7 @@
mips64_asm => {
inherit_from => [ "mips32_asm" ],
template => 1,
sha1_asm_src => add("sha512-mips.S")
sha1_asm_src => add(" ", "sha512-mips.S")
},
s390x_asm => {
template => 1,

32
Configurations/10-main.conf
View file

@ -53,7 +53,7 @@
# with "Illegal mnemonic" error message.
inherit_from => [ "solaris-common", asm("x86_elf_asm") ],
cc => "gcc",
cflags => add_before("-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"),
cflags => add_before(" ", "-march=pentium -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM"),
debug_cflags => "-O0 -g",
release_cflags => "-O3 -fomit-frame-pointer",
thread_cflag => "-pthread",
@ -72,7 +72,7 @@
# <appro@fy.chalmers.se>
inherit_from => [ "solaris-common", asm("x86_64_asm") ],
cc => "gcc",
cflags => add_before("-m64 -Wall -DL_ENDIAN"),
cflags => add_before(" ", "-m64 -Wall -DL_ENDIAN"),
debug_cflags => "-O0 -g",
release_cflags => "-O3",
thread_cflag => "-pthread",
@ -87,12 +87,12 @@
"solaris-x86-cc" => {
inherit_from => [ "solaris-common" ],
cc => "cc",
cflags => add_before("-xarch=generic -xstrconst -Xa -DL_ENDIAN"),
cflags => add_before(" ", "-xarch=generic -xstrconst -Xa -DL_ENDIAN"),
debug_cflags => "-g",
release_cflags => "-xO5 -xregs=frameptr -xdepend -xbuiltin",
thread_cflag => "-D_REENTRANT",
lflags => add("-mt"),
ex_libs => add("-lpthread"),
lflags => add(" ", "-mt"),
ex_libs => add(" ", "-lpthread"),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-KPIC",
shared_ldflag => "-G -dy -z text",
@ -100,12 +100,12 @@
"solaris64-x86_64-cc" => {
inherit_from => [ "solaris-common", asm("x86_64_asm") ],
cc => "cc",
cflags => add_before("-xarch=generic64 -xstrconst -Xa -DL_ENDIAN"),
cflags => add_before(" ", "-xarch=generic64 -xstrconst -Xa -DL_ENDIAN"),
debug_cflags => "-g",
release_cflags => "-xO5 -xdepend -xbuiltin",
thread_cflag => "-D_REENTRANT",
lflags => add("-mt"),
ex_libs => add("-lpthread"),
lflags => add(" ", "-mt"),
ex_libs => add(" ", "-lpthread"),
bn_ops => "SIXTY_FOUR_BIT_LONG",
perlasm_scheme => "elf",
shared_cflag => "-KPIC",
@ -117,7 +117,7 @@
"solaris-sparcv7-gcc" => {
inherit_from => [ "solaris-common" ],
cc => "gcc",
cflags => add_before("-Wall -DB_ENDIAN -DBN_DIV2W"),
cflags => add_before(" ", "-Wall -DB_ENDIAN -DBN_DIV2W"),
debug_cflags => "-O0 -g",
release_cflags => "-O3",
thread_cflag => "-pthread",
@ -151,12 +151,12 @@
"solaris-sparcv7-cc" => {
inherit_from => [ "solaris-common" ],
cc => "cc",
cflags => add_before("-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W"),
cflags => add_before(" ", "-xstrconst -Xa -DB_ENDIAN -DBN_DIV2W"),
debug_cflags => "-g -DBN_DEBUG -DREF_DEBUG -DCONF_DEBUG -DBN_CTX_DEBUG",
release_cflags => "-xO5 -xdepend",
thread_cflag => "-D_REENTRANT",
lflags => add("-mt"),
ex_libs => add("-lpthread"),
lflags => add(" ", "-mt"),
ex_libs => add(" ", "-lpthread"),
bn_ops => "BN_LLONG RC4_CHAR",
shared_cflag => "-KPIC",
shared_ldflag => "-G -dy -z text",
@ -1565,11 +1565,11 @@
},
"vms-alpha-P32" => {
inherit_from => [ "vms-alpha" ],
cflags => add("/POINTER_SIZE=32"),
cflags => add(" ", "/POINTER_SIZE=32"),
},
"vms-alpha-P64" => {
inherit_from => [ "vms-alpha" ],
cflags => add("/POINTER_SIZE=64"),
cflags => add(" ", "/POINTER_SIZE=64"),
},
"vms-ia64" => {
inherit_from => [ "vms-generic" ],
@ -1580,11 +1580,11 @@
},
"vms-ia64-P32" => {
inherit_from => [ "vms-ia64" ],
cflags => add("/POINTER_SIZE=32"),
cflags => add(" ", "/POINTER_SIZE=32"),
},
"vms-ia64-P64" => {
inherit_from => [ "vms-ia64" ],
cflags => add("/POINTER_SIZE=64"),
cflags => add(" ", "/POINTER_SIZE=64"),
},
);

4
Configurations/99-personal-levitte.conf
View file

@ -8,14 +8,14 @@
%targets = (
"levitte-linux-elf" => {
inherit_from => [ "linux-elf" ],
debug_cflags => add("-ggdb -g3"),
debug_cflags => add(" ", "-ggdb -g3"),
debug_defines => add(undef, "LEVITTE_DEBUG"),
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
},
"levitte-linux-x86_64" => {
inherit_from => [ "linux-x86_64" ],
debug_cflags => add("-ggdb -g3"),
debug_cflags => add(" ", "-ggdb -g3"),
debug_defines => add(undef, "LEVITTE_DEBUG"),
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",