diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-01-30 19:10:26 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-01-31 16:19:50 +0100 |
| commit | da7e31e0c7be390d37b84c6200afd802def700c5 (patch) | |
| tree | 36ebe7b8533c6ef59fb72e544b4594dc17fc6016 | |
| parent | 77adb75e16142cd4da2af8814090a4f2c2bd5aea (diff) | |
Build: remove EXTRA
We never used it for anything
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8125)
| -rw-r--r-- | Configurations/README | 1 | ||||
| -rwxr-xr-x | Configure | 9 | ||||
| -rw-r--r-- | crypto/build.info | 3 |
3 files changed, 2 insertions, 11 deletions
diff --git a/Configurations/README b/Configurations/README index 65841b38b6..1e4d54565f 100644 --- a/Configurations/README +++ b/Configurations/README @@ -413,7 +413,6 @@ variables: LIBS=libsomething ENGINES=libeng SCRIPTS=myhack - EXTRA=file1 file2 Note that the files mentioned for PROGRAMS, LIBS and ENGINES *must* be without extensions. The build file templates will figure them out. @@ -1713,7 +1713,6 @@ if ($builder eq "unified") { my @libraries = (); my @engines = (); my @scripts = (); - my @extra = (); my @intermediates = (); my %attributes = (); @@ -1867,9 +1866,6 @@ if ($builder eq "unified") { push @scripts, @s; } }, - qr/^\s*EXTRA\s*=\s*(.*)\s*$/ - => sub { push @extra, tokenize($1) - if !@skip || $skip[$#skip] > 0 }, qr/^\s*ORDINALS\[((?:\\.|[^\\\]])+)\]\s*=\s*(.*)\s*$/, => sub { push @{$ordinals{$1}}, tokenize($2) @@ -1930,8 +1926,7 @@ EOF my %infos = ( programs => [ @programs ], libraries => [ @libraries ], engines => [ @engines ], - scripts => [ @scripts ], - extra => [ @extra ] ); + scripts => [ @scripts ] ); foreach my $k (keys %infos) { foreach (@{$infos{$k}}) { my $item = cleanfile($buildd, $_, $blddir); @@ -2234,7 +2229,7 @@ EOF ### Make unified_info a bit more efficient # One level structures - foreach (("programs", "libraries", "modules", "scripts", "extra")) { + foreach (("programs", "libraries", "engines", "scripts")) { $unified_info{$_} = [ sort keys %{$unified_info{$_}} ]; } # Two level structures diff --git a/crypto/build.info b/crypto/build.info index e014e0336e..5e879ea9b4 100644 --- a/crypto/build.info +++ b/crypto/build.info @@ -14,9 +14,6 @@ SOURCE[../libcrypto]=\ threads_pthread.c threads_win.c threads_none.c getenv.c \ o_init.c o_fips.c mem_sec.c init.c {- $target{cpuid_asm_src} -} \ {- $target{uplink_aux_src} -} -EXTRA= ../ms/uplink-x86.pl ../ms/uplink.c ../ms/applink.c \ - x86cpuid.pl x86_64cpuid.pl ia64cpuid.S \ - ppccpuid.pl pariscid.pl alphacpuid.pl arm64cpuid.pl armv4cpuid.pl DEPEND[cversion.o]=buildinf.h GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)" |