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)

diff --git a/Configurations/README b/Configurations/README
index 65841b38b6e915606a94566754690bbc906d7e6b..1e4d54565f186fcf1f4490c8826f352bc364d66d 100644 (file)
--- a/Configurations/README
+++ b/Configurations/README
@@ -413,7 +413,6 @@ variables:
     LIBS=libsomething
     ENGINES=libeng
     SCRIPTS=myhack
     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.
 
 Note that the files mentioned for PROGRAMS, LIBS and ENGINES *must* be
 without extensions.  The build file templates will figure them out.

diff --git a/Configure b/Configure
index 8052643155aea5c133802e397ac9acb7c977bd22..66541ad1d59fa0e87b61a93eff6a5c167a4610ba 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -1713,7 +1713,6 @@ if ($builder eq "unified") {
         my @libraries = ();
         my @engines = ();
         my @scripts = ();
         my @libraries = ();
         my @engines = ();
         my @scripts = ();

-        my @extra = ();

         my @intermediates = ();
 
         my %attributes = ();
         my @intermediates = ();
 
         my %attributes = ();


@@ -1867,9 +1866,6 @@ if ($builder eq "unified") {
                     push @scripts, @s;
                 }
             },
                     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)
 
             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   ],
             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);
             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
 
     ### 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
         $unified_info{$_} = [ sort keys %{$unified_info{$_}} ];
     }
     # Two level structures

diff --git a/crypto/build.info b/crypto/build.info
index e014e0336ea03608c99dc9daf05aaa0962c8cc9b..5e879ea9b4e211dccbac652bd50698378cb791bb 100644 (file)
--- 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} -}
         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)"
 
 DEPEND[cversion.o]=buildinf.h
 GENERATE[buildinf.h]=../util/mkbuildinf.pl "$(CC) $(LIB_CFLAGS) $(CPPFLAGS_Q)" "$(PLATFORM)"