update build system

This commit is contained in:
Zhi Guan
2017-12-26 22:57:23 +08:00
parent a9b31e17a5
commit d8e57c5432
3 changed files with 24 additions and 3 deletions

4
.gitignore vendored
View File

@@ -17,9 +17,11 @@
# *all* Makefiles # *all* Makefiles
Makefile Makefile
*.tmp
# Java # Java
/java/*.class /java/*.class
/java/Makefile*
# Links under apps # Links under apps
/apps/CA.pl /apps/CA.pl
@@ -203,6 +205,6 @@ apps/gmssl
include/openssl/srp.h include/openssl/srp.h
/build.sh /*.sh

View File

@@ -436,13 +436,14 @@ my @disablables = (
"rsa", "rsa",
"pem", "pem",
"pkcs7", "pkcs7",
"pkcs12",
"serpent", "serpent",
"speck", "speck",
"base58", "base58",
"java", "java",
"ca", "ca",
"gmtls", "gmtls",
"fuzz",
"test",
); );
foreach my $proto ((@tls, @dtls)) foreach my $proto ((@tls, @dtls))
{ {
@@ -932,6 +933,20 @@ foreach (sort (keys %disabled))
push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE"; push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE";
print " OPENSSL_NO_ENGINE (skip engines)"; print " OPENSSL_NO_ENGINE (skip engines)";
} }
elsif (/^test$/)
{
@{$config{dirs}} = grep !/^test$/, @{$config{dirs}};
#@{$config{sdirs}} = grep !/^engine$/, @{$config{sdirs}};
#push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE";
print " OPENSSL_NO_TEST (skip test)";
}
elsif (/^fuzz$/)
{
@{$config{dirs}} = grep !/^fuzz$/, @{$config{dirs}};
#@{$config{sdirs}} = grep !/^engine$/, @{$config{sdirs}};
#push @{$config{openssl_other_defines}}, "OPENSSL_NO_ENGINE";
print " OPENSSL_NO_FUZZ (skip fuzz)";
}
else else
{ {
my ($WHAT, $what); my ($WHAT, $what);

View File

@@ -61,7 +61,11 @@ IF[{- !$disabled{"fuzz-afl"} || !$disabled{"fuzz-libfuzzer"} -}]
ENDIF ENDIF
IF[{- !$disabled{tests} -}] IF[{- !$disabled{tests} -}]
PROGRAMS_NO_INST=asn1-test asn1parse-test bignum-test bndiv-test conf-test crl-test server-test x509-test PROGRAMS_NO_INST=asn1-test asn1parse-test bignum-test bndiv-test conf-test crl-test x509-test
IF[{- !$disabled{"rsa"} -}]
PROGRAMS_NO_INST=server-test
ENDIF
IF[{- !$disabled{"cms"} -}] IF[{- !$disabled{"cms"} -}]
PROGRAMS_NO_INST=cms-test PROGRAMS_NO_INST=cms-test