From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 26 Jan 2011 01:35:07 +0000 (+0000)
Subject: update mkerr.pl for use fips directory, add arx.pl script
X-Git-Tag: OpenSSL-fips-2_0-rc1~856
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3d6a8954f8f2c247e6cc1dd2cb9879cd470dc2ce;p=oweals%2Fopenssl.git

update mkerr.pl for use fips directory, add arx.pl script
---

diff --git a/util/arx.pl b/util/arx.pl
new file mode 100644
index 0000000000..ce62625c33
--- /dev/null
+++ b/util/arx.pl
@@ -0,0 +1,15 @@
+#!/bin/perl
+
+# Simple perl script to wrap round "ar" program and exclude any
+# object files in the environment variable EXCL_OBJ
+
+map { s/^.*\/([^\/]*)$/$1/ ; $EXCL{$_} = 1} split(' ', $ENV{EXCL_OBJ});
+
+#my @ks = keys %EXCL;
+#print STDERR "Excluding: @ks \n";
+
+my @ARGS = grep { !exists $EXCL{$_} } @ARGV;	
+
+system @ARGS;
+
+exit $? >> 8;
diff --git a/util/mkerr.pl b/util/mkerr.pl
index 15b774f277..5dd89582c5 100644
--- a/util/mkerr.pl
+++ b/util/mkerr.pl
@@ -115,7 +115,8 @@ EOF
 }
 
 if($recurse) {
-	@source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>);
+	@source = ( <crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>,
+			<fips/*.c>, <fips/*/*.c>);
 } else {
 	@source = @ARGV;
 }