ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libpq/patches/windows/Solution_RELEASE.patch

   1 diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
   2 index 51711c2bf..d33fdc3b0 100644
   3 --- a/src/tools/msvc/Solution.pm
   4 +++ b/src/tools/msvc/Solution.pm
   5 @@ -650,7 +650,7 @@ sub AddProject
   6         if ($self->{options}->{zlib})
   7         {
   8                 $proj->AddIncludeDir($self->{options}->{zlib} . '\include');
   9 -               $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
  10 +               $proj->AddLibrary($self->{options}->{zlib} . '\lib\zlib.lib'); # This must be updated
  11         }
  12         if ($self->{options}->{openssl})
  13         {
  14 @@ -661,7 +661,7 @@ sub AddProject
  15                 # changed their library names from:
  16                 # - libeay to libcrypto
  17                 # - ssleay to libssl
  18 -               if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
  19 +               if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
  20                 {
  21                         my $dbgsuffix;
  22                         my $libsslpath;
  23 @@ -670,27 +670,27 @@ sub AddProject
  24                         # The format name of the libraries is slightly
  25                         # different between the Win32 and Win64 platform, so
  26                         # adapt.
  27 -                       if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
  28 +                       if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
  29                         {
  30                                 # Win32 here, with a debugging library set.
  31                                 $dbgsuffix     = 1;
  32 -                               $libsslpath    = '\lib\VC\libssl32.lib';
  33 -                               $libcryptopath = '\lib\VC\libcrypto32.lib';
  34 +                               $libsslpath    = '\lib\VC\libssl32.lib'; # This must be updated
  35 +                               $libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
  36                         }
  37 -                       elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
  38 +                       elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
  39                         {
  40                                 # Win64 here, with a debugging library set.
  41                                 $dbgsuffix     = 1;
  42 -                               $libsslpath    = '\lib\VC\libssl64.lib';
  43 -                               $libcryptopath = '\lib\VC\libcrypto64.lib';
  44 +                               $libsslpath    = '\lib\VC\libssl64.lib'; # This must be updated
  45 +                               $libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
  46                         }
  47                         else
  48                         {
  49                                 # On both Win32 and Win64 the same library
  50                                 # names are used without a debugging context.
  51                                 $dbgsuffix     = 0;
  52 -                               $libsslpath    = '\lib\libssl.lib';
  53 -                               $libcryptopath = '\lib\libcrypto.lib';
  54 +                               $libsslpath    = '\lib\libssl.lib'; # This must be updated
  55 +                               $libcryptopath = '\lib\libcrypto.lib'; # This must be updated
  56                         }
  57
  58                         $proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
  59 @@ -698,16 +698,16 @@ sub AddProject
  60                         $proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
  61                                 $dbgsuffix);
  62                 }
  63 -               else
  64 +               else
  65                 {
  66                         # Choose which set of libraries to use depending on if
  67                         # debugging libraries are in place in the installer.
  68 -                       if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
  69 +                       if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
  70                         {
  71                                 $proj->AddLibrary(
  72 -                                       $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
  73 +                                       $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
  74                                 $proj->AddLibrary(
  75 -                                       $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
  76 +                                       $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
  77                         }
  78                         else
  79                         {
  80 @@ -715,60 +715,60 @@ sub AddProject
  81                                 # to be here, so don't ask for it in last
  82                                 # parameter.
  83                                 $proj->AddLibrary(
  84 -                                       $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
  85 +                                       $self->{options}->{openssl} . '\lib\ssleay32.lib', 0); # This must be updated
  86                                 $proj->AddLibrary(
  87 -                                       $self->{options}->{openssl} . '\lib\libeay32.lib', 0);
  88 +                                       $self->{options}->{openssl} . '\lib\libeay32.lib', 0); # This must be updated
  89                         }
  90                 }
  91         }
  92         if ($self->{options}->{nls})
  93         {
  94                 $proj->AddIncludeDir($self->{options}->{nls} . '\include');
  95 -               $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
  96 +               $proj->AddLibrary($self->{options}->{nls} . '\lib\intl.lib'); # This must be updated
  97         }
  98         if ($self->{options}->{gss})
  99         {
 100 -               $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
 101 -               $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
 102 -               $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
 103 -               $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
 104 +               $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');  # This must be updated
 105 +               $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
 106 +               $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
 107 +               $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
 108         }
 109         if ($self->{options}->{iconv})
 110         {
 111                 $proj->AddIncludeDir($self->{options}->{iconv} . '\include');
 112 -               $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
 113 +               $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib'); # This must be updated
 114         }
 115         if ($self->{options}->{icu})
 116         {
 117                 $proj->AddIncludeDir($self->{options}->{icu} . '\include');
 118                 if ($self->{platform} eq 'Win32')
 119                 {
 120 -                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
 121 -                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
 122 -                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
 123 +                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
 124 +                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
 125 +                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
 126                 }
 127                 else
 128                 {
 129 -                       $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
 130 -                       $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
 131 -                       $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
 132 +                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib'); # This must be updated
 133 +                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib'); # This must be updated
 134 +                       $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib'); # This must be updated
 135                 }
 136         }
 137         if ($self->{options}->{xml})
 138         {
 139                 $proj->AddIncludeDir($self->{options}->{xml} . '\include');
 140                 $proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
 141 -               $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
 142 +               $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib'); # This must be updated
 143         }
 144         if ($self->{options}->{xslt})
 145         {
 146                 $proj->AddIncludeDir($self->{options}->{xslt} . '\include');
 147 -               $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
 148 +               $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib'); # This must be updated
 149         }
 150         if ($self->{options}->{uuid})
 151         {
 152                 $proj->AddIncludeDir($self->{options}->{uuid} . '\include');
 153 -               $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
 154 +               $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib'); # This must be updated
 155         }
 156         return $proj;
 157  }