CryptoPkg/OpensslLib: Add "sort" keyword to header file parsing loop

[mirror_edk2.git] / CryptoPkg / Library / OpensslLib / process_files.pl

diff --git a/CryptoPkg/Library/OpensslLib/process_files.pl b/CryptoPkg/Library/OpensslLib/process_files.pl
index 4fe54cd808a5e1987d11ee1743840c8f6b41c312..11cd58cc4eb2d3f4a7b8d14c17b2269c7cd12b94 100755 (executable)
--- a/CryptoPkg/Library/OpensslLib/process_files.pl
+++ b/CryptoPkg/Library/OpensslLib/process_files.pl
@@ -2,7 +2,7 @@
 #\r
 # This script runs the OpenSSL Configure script, then processes the\r
 # resulting file list into our local OpensslLib[Crypto].inf and also\r
-# takes a copy of opensslconf.h.\r
+# takes copies of opensslconf.h and dso_conf.h.\r
 #\r
 # This only needs to be done once by a developer when updating to a\r
 # new version of OpenSSL (or changing options, etc.). Normal users\r
@@ -53,7 +53,7 @@ BEGIN {
                 "no-async",\r
                 "no-autoalginit",\r
                 "no-autoerrinit",\r
-                "no-autoload-config",
+                "no-autoload-config",\r
                 "no-bf",\r
                 "no-blake2",\r
                 "no-camellia",\r
@@ -106,6 +106,14 @@ BEGIN {
                 ) == 0 ||\r
                     die "Failed to generate opensslconf.h!\n";\r
 \r
+            # Generate dso_conf.h per config data\r
+            system(\r
+                "perl -I. -Mconfigdata util/dofile.pl " .\r
+                "crypto/include/internal/dso_conf.h.in " .\r
+                "> include/internal/dso_conf.h"\r
+                ) == 0 ||\r
+                    die "Failed to generate dso_conf.h!\n";\r
+\r
             chdir($basedir) ||\r
                 die "Cannot change to base directory \"" . $basedir . "\"";\r
 \r
@@ -149,7 +157,7 @@ foreach my $product ((@{$unified_info{libraries}},
 # Update the perl script to generate the missing header files\r
 #\r
 my @dir_list = ();\r
-for (keys %{$unified_info{dirinfo}}){\r
+for (sort keys %{$unified_info{dirinfo}}){\r
   push @dir_list,$_;\r
 }\r
 \r
@@ -249,12 +257,17 @@ rename( $new_inf_file, $inf_file ) ||
 print "Done!";\r
 \r
 #\r
-# Copy opensslconf.h generated from OpenSSL Configuration\r
+# Copy opensslconf.h and dso_conf.h generated from OpenSSL Configuration\r
 #\r
 print "\n--> Duplicating opensslconf.h into Include/openssl ... ";\r
 copy($OPENSSL_PATH . "/include/openssl/opensslconf.h",\r
      $OPENSSL_PATH . "/../../Include/openssl/") ||\r
    die "Cannot copy opensslconf.h!";\r
+print "Done!";\r
+print "\n--> Duplicating dso_conf.h into Include/internal ... ";\r
+copy($OPENSSL_PATH . "/include/internal/dso_conf.h",\r
+     $OPENSSL_PATH . "/../../Include/internal/") ||\r
+   die "Cannot copy dso_conf.h!";\r
 print "Done!\n";\r
 \r
 print "\nProcessing Files Done!\n";\r