leviathan
/
openssl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move the Configure generated header files to the top build.info 

This turns these headers into build file generated ones.

Reviewed-by: Rich Salz <rsalz@openssl.org>
master
Richard Levitte 2016-06-13 22:01:08 +02:00
parent 4f858293a9
commit 27ffb86c20
2 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Configure
View File

@ -463,17 +463,6 @@ while ((my $first, my $second) = (shift @list, shift @list)) {
# To remove something from %disabled, use "enable-foo".
# For symmetry, "disable-foo" is a synonym for "no-foo".
my @generated_headers = (
"include/openssl/opensslconf.h",
"crypto/include/internal/bn_conf.h",
"crypto/include/internal/dso_conf.h"
);
my @generated_by_make_headers = (
"crypto/buildinf.h"
);
my $no_sse2=0;
&usage if ($#ARGV < 0);
@ -1936,12 +1925,6 @@ print "THIRTY_TWO_BIT mode\n" if $config{b32};
print "BN_LLONG mode\n" if $config{bn_ll};
print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} ne $def_int;
for (@generated_headers) {
mkpath(catdir($blddir, dirname($_)));
run_dofile(catfile($blddir, $_),
catfile($srcdir, $_.".in"));
}
my %builders = (
unified => sub {
run_dofile(catfile($blddir, $target{build_file}),

12
build.info
View File

@ -6,6 +6,18 @@ INCLUDE[libcrypto]="{- rel2abs(catdir($builddir,"include")) -}" . crypto/include
INCLUDE[libssl]="{- rel2abs(catdir($builddir,"include")) -}" . include
DEPEND[libssl]=libcrypto
# Empty DEPEND "indices" means the dependencies are expected to be built
# unconditionally before anything else.
DEPEND[]=include/openssl/opensslconf.h crypto/include/internal/bn_conf.h \
crypto/include/internal/dso_conf.h
DEPEND[include/openssl/opensslconf.h]=configdata.pm
GENERATE[include/openssl/opensslconf.h]=include/openssl/opensslconf.h.in
DEPEND[crypto/include/internal/bn_conf.h]=configdata.pm
GENERATE[crypto/include/internal/bn_conf.h]=crypto/include/internal/bn_conf.h.in
DEPEND[crypto/include/internal/dso_conf.h]=configdata.pm
GENERATE[crypto/include/internal/dso_conf.h]=crypto/include/internal/dso_conf.h.in
IF[{- $config{target} =~ /^Cygwin/ -}]
SHARED_NAME[libcrypto]=cygcrypto-{- $config{shlib_major}.".".$config{shlib_minor} -}
SHARED_NAME[libssl]=cygssl-{- $config{shlib_major}.".".$config{shlib_minor} -}