Branch libreoffice-24-8-3
[LibreOffice.git] / external / openssl / openssl-no-multilib.patch.0
blobda9adf35785a619efddb68e1fd195d18afbc7614
1 --- Configure.orig      2020-04-21 14:22:39.000000000 +0200
2 +++ Configure   2020-07-07 17:25:19.256297500 +0200
3 @@ -27,7 +27,7 @@
4  my $orig_death_handler = $SIG{__DIE__};
5  $SIG{__DIE__} = \&death_handler;
6  
7 -my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n";
8 +my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-egd] [no-multilib] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--config=FILE] os/compiler[:flags]\n";
9  
10  my $banner = <<"EOF";
12 @@ -86,6 +86,7 @@
13  #               If disabled, it also disables shared and dynamic-engine.
14  # no-asm        do not use assembler
15  # no-egd        do not compile support for the entropy-gathering daemon APIs
16 +# no-multilib   exclude multilib identifier from library name
17  # [no-]zlib     [don't] compile support for zlib compression.
18  # zlib-dynamic  Like "zlib", but the zlib library is expected to be a shared
19  #               library and will be loaded in run-time by the OpenSSL library.
20 @@ -458,6 +459,7 @@
21      "module",
22      "msan",
23      "multiblock",
24 +    "multilib",
25      "nextprotoneg",
26      "ocb",
27      "ocsp",
28 @@ -1907,6 +1909,10 @@
30      my @build_dirs = ( [ ] );   # current directory
32 +    if ($disabled{"multilib"}) {
33 +        $target{"multilib"} = "";
34 +    }
35 +    
36      $config{build_infos} = [ ];
38      # We want to detect configdata.pm in the source tree, so we