Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit ab81d00

Browse filesBrowse files
michaelpqmichaelpq
committed
Fix MSVC scripts when building with GSSAPI/Kerberos
The deliverables of upstream Kerberos on Windows are installed with paths that do not match our MSVC scripts. First, the include folder was named "inc/" in our scripts, but the upstream MSIs use "include/". Second, the build would fail with 64-bit environments as the libraries are named differently. This commit adjusts the MSVC scripts to be compatible with the latest installations of upstream, and I have checked that the compilation was able to work with the 32-bit and 64-bit installations. Special thanks to Kondo Yuta for the help in investigating the situation in hamerkop, which had an incorrect configuration for the GSS compilation. Reported-by: Brian Ye Discussion: https://postgr.es/m/162128202219.27274.12616756784952017465@wrigleys.postgresql.org Backpatch-through: 9.6
1 parent 0ab64ab commit ab81d00
Copy full SHA for ab81d00

File tree

Expand file treeCollapse file tree

1 file changed

+20
-4
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+20
-4
lines changed

‎src/tools/msvc/Solution.pm

Copy file name to clipboardExpand all lines: src/tools/msvc/Solution.pm
+20-4Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,10 +1003,26 @@ sub AddProject
10031003
}
10041004
if ($self->{options}->{gss})
10051005
{
1006-
$proj->AddIncludeDir($self->{options}->{gss} . '\inc\krb5');
1007-
$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\krb5_32.lib');
1008-
$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\comerr32.lib');
1009-
$proj->AddLibrary($self->{options}->{gss} . '\lib\i386\gssapi32.lib');
1006+
$proj->AddIncludeDir($self->{options}->{gss} . '\include');
1007+
$proj->AddIncludeDir($self->{options}->{gss} . '\include\krb5');
1008+
if ($self->{platform} eq 'Win32')
1009+
{
1010+
$proj->AddLibrary(
1011+
$self->{options}->{gss} . '\lib\i386\krb5_32.lib');
1012+
$proj->AddLibrary(
1013+
$self->{options}->{gss} . '\lib\i386\comerr32.lib');
1014+
$proj->AddLibrary(
1015+
$self->{options}->{gss} . '\lib\i386\gssapi32.lib');
1016+
}
1017+
else
1018+
{
1019+
$proj->AddLibrary(
1020+
$self->{options}->{gss} . '\lib\amd64\krb5_64.lib');
1021+
$proj->AddLibrary(
1022+
$self->{options}->{gss} . '\lib\amd64\comerr64.lib');
1023+
$proj->AddLibrary(
1024+
$self->{options}->{gss} . '\lib\amd64\gssapi64.lib');
1025+
}
10101026
}
10111027
if ($self->{options}->{iconv})
10121028
{

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.