mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 18:28:59 +08:00
bdae0904c4
* [ports] Update openssl-unix to 1.1.1c * [ports] Update openssl-unix to 1.1.1d * [ports] openssl-unix platform 'AMD64' is called 'x86_64' on Linux * [ports] fix openssl platform * [ports] openssl-windows update openssl to 1.1.1d * [ports] Fix openssl post build * [ports] openssl add EnableUWPSupport.patch Reference: https://github.com/openssl/openssl/pull/8917 https://github.com/openssl/openssl/pull/9440 * [ports] openssl-uwp update openssl to 1.1.1d * Updated support for OpenSSL v1.1 With OpenSSL v1.1 we need an additional flag for ACE * update to 12.0 and change to vcpkg_configure_make * remove msys line * remove custom cmakelists * use --without-readline on linux * Update CONTROL Fix version * fix portfile * add all possible libpq features * create vcpkg_get_build_depends * create vcpkg_read_dependent_port_info * add vcpkg_write_port_info * fix a few bugs * libpq first succesful x86 build with core features. (files still must be moved) * always write the variable * Fix separate make and install execution error issue. * trigger CI system. * add openssl and win_bison win_flex patch * add configuration dependent patches * add bonjour as a dependency on macosx * apply patches and configure features * more patches to fix the windows build * more install fixes * remove unnecessary code * bit of code cleanup * remove unrelated files * remove unrelated function call. function was removed with last commit * removed hardcoded platform * fix patch * build only the interface libraries and nothing more * forgot to remove tool ecpg from install * seperate minimal install patch from normal install patch and introduce client feature * fix x86 Platform variable being x86 and not Win32 as required by the generated project * make linux build work * make more linux work * openssl return version number directly without calling openssl (should probably be done differently) * fix some more path and platform identification * comments to reduce install. currently libpq installs static and shared libraries and some tools on linux * patch arm * fix platform detection logic * make libpq osx buildable * Rename debug import library after build. (So that we don't affect external CMake users.) * revert debug naming and install a wrapper instead. * fix gdal regression due to name change * fix cutelyst regression due to qt5-base wrapper (why was it not using the target in the first place?) * correct wrapper install path * correct the arm patch. * trying to fix static gdal build * gdal still needs more work * update version of openssl in libpq openssl patch * nmap fix openssl * qt5 fix openssl * gdal fix openssl * librtmp migrate to openssl 1.1.1 * fail in patch since what is intended is not going to work in openssl 1.1.1 * fix static yara build * freedtds deactivate openssl feature until freetds decides to upgrade to 1.1 * fix libwebsockets cmakelists * fix the patch so that the generated targets also include crypt32 * xmlsec add threads dependency * bump control since I am unable to reproduce the regression * add pthread to openssl detection logic * fix freetds linkage missing crypt32 and fix the cmake checks. * fix the openssl wrapper to add the threads library * fix libmysql regression * add threads to openssl libraries. * upgrade libssh to 0.9 * fix nmap regression * fix mosquitto regression * fix openssl wrapper to make libarchive work * fix quickfix * changed patch a bit * improve freetds patch * fix case in librtmp * update control * bump control * fix case * make jasper a dependency of qt5-imageformats to fix flaky CI build. * add jasper libraries explicitly * jasper depends on freeglut so add it as a dependency. turbo_jpeg is also a dependency but that should already be handled in qt5-base * more glut names * bump control for macosx ci retry * fix slikenet regression * fix linebreak in qt5-base * update baseline * Update ci.baseline.txt those ports are not supported on UWP * [libevent] add dependency on libevent[threads] to openssl feature * [pdal,freerdp] Update CI baseline to fail * fix static pdal build * fix freerdp on linux * trying to revert some changes * revert changes in build make * revert x264 version bump Co-authored-by: Force Charlie <6904176+fcharlie@users.noreply.github.com> Co-authored-by: Johnny Willemsen <jwillemsen@remedy.nl> Co-authored-by: Lennart Trunk <lennart.trunk@outlook.de> Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
158 lines
6.8 KiB
Diff
158 lines
6.8 KiB
Diff
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
|
|
index 51711c2bf..d33fdc3b0 100644
|
|
--- a/src/tools/msvc/Solution.pm
|
|
+++ b/src/tools/msvc/Solution.pm
|
|
@@ -650,7 +650,7 @@ sub AddProject
|
|
if ($self->{options}->{zlib})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
|
|
- $proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
|
|
+ $proj->AddLibrary($self->{options}->{zlib} . '\debug\lib\zlibd.lib'); # This must be updated
|
|
}
|
|
if ($self->{options}->{openssl})
|
|
{
|
|
@@ -661,7 +661,7 @@ sub AddProject
|
|
# changed their library names from:
|
|
# - libeay to libcrypto
|
|
# - ssleay to libssl
|
|
- if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0')
|
|
+ if ($digit1 >= '1' && $digit2 >= '1' && $digit3 >= '0') # This must be updated
|
|
{
|
|
my $dbgsuffix;
|
|
my $libsslpath;
|
|
@@ -670,27 +670,27 @@ sub AddProject
|
|
# The format name of the libraries is slightly
|
|
# different between the Win32 and Win64 platform, so
|
|
# adapt.
|
|
- if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib")
|
|
+ if (-e "$self->{options}->{openssl}/lib/VC/sslcrypto32MD.lib") # This must be updated
|
|
{
|
|
# Win32 here, with a debugging library set.
|
|
$dbgsuffix = 1;
|
|
- $libsslpath = '\lib\VC\libssl32.lib';
|
|
- $libcryptopath = '\lib\VC\libcrypto32.lib';
|
|
+ $libsslpath = '\lib\VC\libssl32.lib'; # This must be updated
|
|
+ $libcryptopath = '\lib\VC\libcrypto32.lib'; # This must be updated
|
|
}
|
|
- elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib")
|
|
+ elsif (-e "$self->{options}->{openssl}/lib/VC/sslcrypto64MD.lib") # This must be updated
|
|
{
|
|
# Win64 here, with a debugging library set.
|
|
$dbgsuffix = 1;
|
|
- $libsslpath = '\lib\VC\libssl64.lib';
|
|
- $libcryptopath = '\lib\VC\libcrypto64.lib';
|
|
+ $libsslpath = '\lib\VC\libssl64.lib'; # This must be updated
|
|
+ $libcryptopath = '\lib\VC\libcrypto64.lib'; # This must be updated
|
|
}
|
|
else
|
|
{
|
|
# On both Win32 and Win64 the same library
|
|
# names are used without a debugging context.
|
|
$dbgsuffix = 0;
|
|
- $libsslpath = '\lib\libssl.lib';
|
|
- $libcryptopath = '\lib\libcrypto.lib';
|
|
+ $libsslpath = '\debug\lib\libssl.lib'; # This must be updated
|
|
+ $libcryptopath = '\debug\lib\libcrypto.lib'; # This must be updated
|
|
}
|
|
|
|
$proj->AddLibrary($self->{options}->{openssl} . $libsslpath,
|
|
@@ -698,16 +698,16 @@ sub AddProject
|
|
$proj->AddLibrary($self->{options}->{openssl} . $libcryptopath,
|
|
$dbgsuffix);
|
|
}
|
|
- else
|
|
+ else
|
|
{
|
|
# Choose which set of libraries to use depending on if
|
|
# debugging libraries are in place in the installer.
|
|
- if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib")
|
|
+ if (-e "$self->{options}->{openssl}/lib/VC/ssleay32MD.lib") # This must be updated
|
|
{
|
|
$proj->AddLibrary(
|
|
- $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
|
|
+ $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); # This must be updated
|
|
$proj->AddLibrary(
|
|
- $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
|
|
+ $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); # This must be updated
|
|
}
|
|
else
|
|
{
|
|
@@ -715,60 +715,60 @@ sub AddProject
|
|
# to be here, so don't ask for it in last
|
|
# parameter.
|
|
$proj->AddLibrary(
|
|
- $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
|
|
+ $self->{options}->{openssl} . '\debug\lib\ssleay32.lib', 0); # This must be updated
|
|
$proj->AddLibrary(
|
|
- $self->{options}->{openssl} . '\lib\libeay32.lib', 0);
|
|
+ $self->{options}->{openssl} . '\debug\lib\libeay32.lib', 0); # This must be updated
|
|
}
|
|
}
|
|
}
|
|
if ($self->{options}->{nls})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{nls} . '\include');
|
|
- $proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
|
|
+ $proj->AddLibrary($self->{options}->{nls} . '\debug\lib\libintl.lib'); # This must be updated
|
|
}
|
|
if ($self->{options}->{gss})
|
|
{
|
|
- $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
|
|
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
|
|
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
|
|
- $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
|
|
+ $proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5'); # This must be updated
|
|
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib'); # This must be updated
|
|
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');# This must be updated
|
|
+ $proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');# This must be updated
|
|
}
|
|
if ($self->{options}->{iconv})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{iconv} . '\include');
|
|
- $proj->AddLibrary($self->{options}->{iconv} . '\lib\iconv.lib');
|
|
+ $proj->AddLibrary($self->{options}->{iconv} . '\debug\lib\iconv.lib'); # This must be updated
|
|
}
|
|
if ($self->{options}->{icu})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{icu} . '\include');
|
|
if ($self->{platform} eq 'Win32')
|
|
{
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icuuc.lib');
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib\icudt.lib');
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
|
|
}
|
|
else
|
|
{
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuin.lib');
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icuuc.lib');
|
|
- $proj->AddLibrary($self->{options}->{icu} . '\lib64\icudt.lib');
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuind.lib'); # This must be updated
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icuucd.lib'); # This must be updated
|
|
+ $proj->AddLibrary($self->{options}->{icu} . '\debug\lib\icudtd.lib'); # This must be updated
|
|
}
|
|
}
|
|
if ($self->{options}->{xml})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{xml} . '\include');
|
|
$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
|
|
- $proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
|
|
+ $proj->AddLibrary($self->{options}->{xml} . '\debug\lib\libxml2.lib'); # This must be updated
|
|
}
|
|
if ($self->{options}->{xslt})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
|
|
- $proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
|
|
+ $proj->AddLibrary($self->{options}->{xslt} . '\debug\lib\libxslt.lib'); # This must be updated
|
|
}
|
|
if ($self->{options}->{uuid})
|
|
{
|
|
$proj->AddIncludeDir($self->{options}->{uuid} . '\include');
|
|
- $proj->AddLibrary($self->{options}->{uuid} . '\lib\uuid.lib');
|
|
+ $proj->AddLibrary($self->{options}->{uuid} . '\debug\lib\uuid.lib'); # This must be updated
|
|
}
|
|
return $proj;
|
|
}
|