summaryrefslogtreecommitdiff
path: root/Configure
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2022-01-27 11:56:56 +0000
committerTomas Mraz <tomas@openssl.org>2022-03-22 14:08:15 +0100
commit9e1a54f4a187195fc417ad0f90e84d208d478968 (patch)
tree4e84c8e291460a4e610b2d9f26661c019f6317ad /Configure
parent388d6f4506892a47e69d28232c4b7ebd43706478 (diff)
downloadopenssl-new-9e1a54f4a187195fc417ad0f90e84d208d478968.tar.gz
Configure: don't try to be clever when configuring afalgeng
If the afalgeng is enabled then Configure tries to be clever but fails, by only actually building afalgeng if it isn't being cross-compiled and if the current kernel is 4.1+. This means that everyone cross compiling, or whose builder machines are running older kernels (not uncommon for build farms), can't enable afalgeng. Instead remove the cleverness and simply enable/disable as requested. Fixes #7687 CLA: trivial Signed-off-by: Ross Burton <ross.burton@arm.com> Change-Id: I023b6cb535d5b5811823d4814fa939de3f304886 Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7688)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure15
1 files changed, 1 insertions, 14 deletions
diff --git a/Configure b/Configure
index 355969356e..8b0b25d5f6 100755
--- a/Configure
+++ b/Configure
@@ -1683,20 +1683,7 @@ $config{CFLAGS} = [ map { $_ eq '--ossl-strict-warnings'
unless ($disabled{afalgeng}) {
$config{afalgeng}="";
if (grep { $_ eq 'afalgeng' } @{$target{enable}}) {
- my $minver = 4*10000 + 1*100 + 0;
- if ($config{CROSS_COMPILE} eq "") {
- my $verstr = `uname -r`;
- my ($ma, $mi1, $mi2) = split("\\.", $verstr);
- ($mi2) = $mi2 =~ /(\d+)/;
- my $ver = $ma*10000 + $mi1*100 + $mi2;
- if ($ver < $minver) {
- disable('too-old-kernel', 'afalgeng');
- } else {
- push @{$config{engdirs}}, "afalg";
- }
- } else {
- disable('cross-compiling', 'afalgeng');
- }
+ push @{$config{engdirs}}, "afalg";
} else {
disable('not-linux', 'afalgeng');
}