Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | Don't refuse to build afalgeng if cross-compiling or the host kernel is too old. |
| 2 | |
| 3 | Upstream-Status: Submitted [hhttps://github.com/openssl/openssl/pull/7688] |
| 4 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 5 | |
Andrew Geissler | 615f2f1 | 2022-07-15 14:00:58 -0500 | [diff] [blame^] | 6 | Index: openssl-3.0.4/Configure |
| 7 | =================================================================== |
| 8 | --- openssl-3.0.4.orig/Configure |
| 9 | +++ openssl-3.0.4/Configure |
| 10 | @@ -1681,20 +1681,7 @@ $config{CFLAGS} = [ map { $_ eq '--ossl- |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 11 | unless ($disabled{afalgeng}) { |
| 12 | $config{afalgeng}=""; |
| 13 | if (grep { $_ eq 'afalgeng' } @{$target{enable}}) { |
| 14 | - my $minver = 4*10000 + 1*100 + 0; |
| 15 | - if ($config{CROSS_COMPILE} eq "") { |
| 16 | - my $verstr = `uname -r`; |
| 17 | - my ($ma, $mi1, $mi2) = split("\\.", $verstr); |
| 18 | - ($mi2) = $mi2 =~ /(\d+)/; |
| 19 | - my $ver = $ma*10000 + $mi1*100 + $mi2; |
| 20 | - if ($ver < $minver) { |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 21 | - disable('too-old-kernel', 'afalgeng'); |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | - } else { |
| 23 | - push @{$config{engdirs}}, "afalg"; |
| 24 | - } |
| 25 | - } else { |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 26 | - disable('cross-compiling', 'afalgeng'); |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 27 | - } |
| 28 | + push @{$config{engdirs}}, "afalg"; |
| 29 | } else { |
Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame] | 30 | disable('not-linux', 'afalgeng'); |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 31 | } |