projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/recipes/90-test_shlibload.t needs $target{shared_extension}
[openssl.git]
/
Configurations
/
00-base-templates.conf
diff --git
a/Configurations/00-base-templates.conf
b/Configurations/00-base-templates.conf
index 0350997ff7ed86313fe9f5fb32a94a1254b3b47d..8555ba158baf7b38e9fc4859af403c1694245f49 100644
(file)
--- a/
Configurations/00-base-templates.conf
+++ b/
Configurations/00-base-templates.conf
@@
-8,6
+8,9
@@
my %targets=(
lflags => "",
defines => [],
includes => [],
lflags => "",
defines => [],
includes => [],
+ lib_cflags => "",
+ lib_cppflags => "",
+ lib_defines => [],
thread_scheme => "(unknown)", # Assume we don't know
thread_defines => [],
thread_scheme => "(unknown)", # Assume we don't know
thread_defines => [],
@@
-31,6
+34,7
@@
my %targets=(
padlock_asm_src => "",
chacha_asm_src => "chacha_enc.c",
poly1305_asm_src => "",
padlock_asm_src => "",
chacha_asm_src => "chacha_enc.c",
poly1305_asm_src => "",
+ keccak1600_asm_src => "keccak1600.c",
unistd => "<unistd.h>",
shared_target => "",
unistd => "<unistd.h>",
shared_target => "",
@@
-41,21
+45,21
@@
my %targets=(
shared_extension => "",
#### Defaults for the benefit of the config targets who don't inherit
shared_extension => "",
#### Defaults for the benefit of the config targets who don't inherit
- #### a BASE and assume Unix
ly
defaults
+ #### a BASE and assume Unix defaults
#### THESE WILL DISAPPEAR IN OpenSSL 1.2
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
#### THESE WILL DISAPPEAR IN OpenSSL 1.2
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
-
ar
=> "ar",
-
arflags
=> "r",
-
cc
=> "cc",
-
hashbangperl
=> "/usr/bin/env perl",
-
ranlib
=> sub { which("$config{cross_compile_prefix}ranlib")
+
AR
=> "ar",
+
ARFLAGS
=> "r",
+
CC
=> "cc",
+
HASHBANGPERL
=> "/usr/bin/env perl",
+
RANLIB
=> sub { which("$config{cross_compile_prefix}ranlib")
? "ranlib" : "" },
? "ranlib" : "" },
-
rc
=> "windres",
+
RC
=> "windres",
#### THESE WILL BE ENABLED IN OpenSSL 1.2
#### THESE WILL BE ENABLED IN OpenSSL 1.2
- #
hashbangperl
=> "PERL", # Only Unix actually cares
+ #
HASHBANGPERL
=> "PERL", # Only Unix actually cares
},
BASE_common => {
},
BASE_common => {
@@
-84,19
+88,21
@@
my %targets=(
inherit_from => [ "BASE_common" ],
template => 1,
inherit_from => [ "BASE_common" ],
template => 1,
-
ar
=> "ar",
-
arflags
=> "r",
-
cc
=> "cc",
+
AR
=> "ar",
+
ARFLAGS
=> "r",
+
CC
=> "cc",
lflags =>
sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () },
ex_libs =>
sub { !defined($disabled{zlib})
&& defined($disabled{"zlib-dynamic"})
? "-lz" : () },
lflags =>
sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () },
ex_libs =>
sub { !defined($disabled{zlib})
&& defined($disabled{"zlib-dynamic"})
? "-lz" : () },
-
hashbangperl
=> "/usr/bin/env perl", # Only Unix actually cares
-
ranlib
=> sub { which("$config{cross_compile_prefix}ranlib")
+
HASHBANGPERL
=> "/usr/bin/env perl", # Only Unix actually cares
+
RANLIB
=> sub { which("$config{cross_compile_prefix}ranlib")
? "ranlib" : "" },
? "ranlib" : "" },
- rc => "windres",
+ RC => "windres",
+
+ shared_extension => ".so",
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
build_scheme => [ "unified", "unix" ],
build_file => "Makefile",
@@
-106,6
+112,15
@@
my %targets=(
inherit_from => [ "BASE_common" ],
template => 1,
inherit_from => [ "BASE_common" ],
template => 1,
+ lib_defines =>
+ sub {
+ my @defs = ();
+ unless ($disabled{"zlib-dynamic"}) {
+ my $zlib = $withargs{zlib_lib} // "ZLIB1";
+ push @defs, 'LIBZ=' . (quotify("perl", $zlib))[0];
+ }
+ return [ @defs ];
+ },
ex_libs =>
sub {
unless ($disabled{zlib}) {
ex_libs =>
sub {
unless ($disabled{zlib}) {
@@
-116,19
+131,21
@@
my %targets=(
return ();
},
return ();
},
-
ld
=> "link",
-
lflags
=> "/nologo",
- l
outflag
=> "/out:",
-
ar
=> "lib",
-
arflags
=> "/nologo",
+
LD
=> "link",
+
LDFLAGS
=> "/nologo",
+ l
doutflag
=> "/out:",
+
AR
=> "lib",
+
ARFLAGS
=> "/nologo",
aroutflag => "/out:",
aroutflag => "/out:",
-
rc
=> "rc",
+
RC
=> "rc",
rcoutflag => "/fo",
rcoutflag => "/fo",
-
mt
=> "mt",
-
mtflags
=> "-nologo",
+
MT
=> "mt",
+
MTFLAGS
=> "-nologo",
mtinflag => "-manifest ",
mtoutflag => "-outputresource:",
mtinflag => "-manifest ",
mtoutflag => "-outputresource:",
+ shared_extension => ".dll",
+
build_file => "makefile",
build_scheme => [ "unified", "windows" ],
},
build_file => "makefile",
build_scheme => [ "unified", "windows" ],
},
@@
-147,6
+164,8
@@
my %targets=(
return [ @incs ];
}),
return [ @incs ];
}),
+ shared_extension => ".exe",
+
build_file => "descrip.mms",
build_scheme => [ "unified", "VMS" ],
},
build_file => "descrip.mms",
build_scheme => [ "unified", "VMS" ],
},
@@
-214,6
+233,7
@@
my %targets=(
padlock_asm_src => "e_padlock-x86_64.s",
chacha_asm_src => "chacha-x86_64.s",
poly1305_asm_src=> "poly1305-x86_64.s",
padlock_asm_src => "e_padlock-x86_64.s",
chacha_asm_src => "chacha-x86_64.s",
poly1305_asm_src=> "poly1305-x86_64.s",
+ keccak1600_asm_src => "keccak1600-x86_64.s",
},
ia64_asm => {
template => 1,
},
ia64_asm => {
template => 1,
@@
-275,6
+295,7
@@
my %targets=(
modes_asm_src => "ghash-s390x.S",
chacha_asm_src => "chacha-s390x.S",
poly1305_asm_src=> "poly1305-s390x.S",
modes_asm_src => "ghash-s390x.S",
chacha_asm_src => "chacha-s390x.S",
poly1305_asm_src=> "poly1305-s390x.S",
+ keccak1600_asm_src => "keccak1600-s390x.S",
},
armv4_asm => {
template => 1,
},
armv4_asm => {
template => 1,
@@
-286,6
+307,7
@@
my %targets=(
modes_asm_src => "ghash-armv4.S ghashv8-armx.S",
chacha_asm_src => "chacha-armv4.S",
poly1305_asm_src=> "poly1305-armv4.S",
modes_asm_src => "ghash-armv4.S ghashv8-armx.S",
chacha_asm_src => "chacha-armv4.S",
poly1305_asm_src=> "poly1305-armv4.S",
+ keccak1600_asm_src => "keccak1600-armv4.S",
perlasm_scheme => "void"
},
aarch64_asm => {
perlasm_scheme => "void"
},
aarch64_asm => {
@@
-298,6
+320,7
@@
my %targets=(
modes_asm_src => "ghashv8-armx.S",
chacha_asm_src => "chacha-armv8.S",
poly1305_asm_src=> "poly1305-armv8.S",
modes_asm_src => "ghashv8-armx.S",
chacha_asm_src => "chacha-armv8.S",
poly1305_asm_src=> "poly1305-armv8.S",
+ keccak1600_asm_src => "keccak1600-armv8.S",
},
parisc11_asm => {
template => 1,
},
parisc11_asm => {
template => 1,
@@
-327,7
+350,7
@@
my %targets=(
ppc64_asm => {
inherit_from => [ "ppc32_asm" ],
template => 1,
ppc64_asm => {
inherit_from => [ "ppc32_asm" ],
template => 1,
- ec_asm_src => "ecp_nistz256.c ecp_nistz256-ppc64.s",
-
+ ec_asm_src => "ecp_nistz256.c ecp_nistz256-ppc64.s
x25519-ppc64.s
",
+ keccak1600_asm_src => "keccak1600-ppc64.s",
},
);
},
);