Date: Tue, 18 May 2021 14:56:59 +0900
From: Michael Paquier <michael@paquier.xyz>
To: brian.y.ye@gmail.com, pgsql-docs@lists.postgresql.org
Subject: Re: Error building for 64-bit Windows (10)
Message-ID: <YKNXK88JHdgLgkF/@paquier.xyz>
References: <162128202219.27274.12616756784952017465@wrigleys.postgresql.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="lCQJCMiEL68sRdbd"
Content-Disposition: inline
In-Reply-To: <162128202219.27274.12616756784952017465@wrigleys.postgresql.org>
Archived-At: 
 <https://www.postgresql.org/message-id/YKNXK88JHdgLgkF/%40paquier.xyz>
Precedence: bulk


--lCQJCMiEL68sRdbd
Content-Type: multipart/mixed; boundary="GafiVAvjIhd6snMW"
Content-Disposition: inline


--GafiVAvjIhd6snMW
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Mon, May 17, 2021 at 08:07:02PM +0000, PG Doc comments form wrote:
> The Solution.pm file has the following lines:
> 	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');
> 	}
> I had to change them to the following or the compiling failed:
> 	if ($self->{options}->{gss})
> 	{
> 		$proj->AddIncludeDir($self->{options}->{gss} . '\include');
> 		$proj->AddIncludeDir($self->{options}->{gss} . '\include\krb5');
> 		$proj->AddLibrary($self->{options}->{gss} . '\lib\amd64\krb5_64.lib');
> 		$proj->AddLibrary($self->{options}->{gss} . '\lib\amd64\comerr64.lib');
> 		$proj->AddLibrary($self->{options}->{gss} . '\lib\amd64\gssapi64.lib');

Yes, you are right.  I have been playing with the deliverables we
recommend in the docs as of [1], and there are a couple of gotchas
here:
- For the 32b and 64b MSI installer, the include path is not "inc",
but "include".  So I could not get the installation on Win32 to work
either on HEAD.
- There is a sub-path called "include/krb5", which is not really
necessary except if we use krb5.h, but we don't.  Upstream code
recommends actually to use krb5/krb5.h, meaning that only "include/"
would be sufficient.  Keeping "include/krb5/" around is not a big deal
either.

This has not been changed in ages, so perhaps few have bothered.
Anyway, the attached patch fixes both the 32b and 64b builds for me.
Another interesting thing is that the installation of krb5 for amd64
and i386 cannot co-exist together, so installing one removes the
second automatically.

[1]: https://web.mit.edu/Kerberos/dist/index.html
--
Michael

--GafiVAvjIhd6snMW
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="fix-gss-msvc.patch"

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 3c5fe5dddc..05866af925 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -1023,10 +1023,20 @@ sub AddProject
 	}
 	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} . '\include');
+		$proj->AddIncludeDir($self->{options}->{gss} . '\include\krb5');
+		if ($self->{platform} eq 'Win32')
+		{
+			$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');
+		}
+		else
+		{
+			$proj->AddLibrary($self->{options}->{gss} . '\lib\amd64\krb5_64.lib');
+			$proj->AddLibrary($self->{options}->{gss} . '\lib\amd64\comerr64.lib');
+			$proj->AddLibrary($self->{options}->{gss} . '\lib\amd64\gssapi64.lib');
+		}
 	}
 	if ($self->{options}->{iconv})
 	{

--GafiVAvjIhd6snMW--

--lCQJCMiEL68sRdbd
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEG72nH6vTowiyblFKnvQgOdbyQH0FAmCjVysACgkQnvQgOdby
QH3SnA/+MDHGjLDwPcye3ZMyk2ufomYkTMqp8IMVFU0MNHfQJyzEsC80XpMbYnai
9xiUeLwkgPfPtD/Uf30EFMhELNOCq2TS+Qwb0ZtBaGMrVAwfohaTyc+fhJS/4f2M
Ya2v5w17qIvTq1jc7a8B6d+1AiFM4d2GFxncKvbV4OLjhSnE9aSTKtrppDm531tj
XuhPaKX2coSH8ChPERjPB0H6B5M4xFLOiZPCbzDX9Ti04ZTHJNDPVvZzuHfVmPLt
6sQ6mXpDnTrGGK+37KjTBQyHWJCCWkn4ltcIV8RlfUcBgVR22XqXaAI4sHHgwPKq
Yb/I/oCIWN6deEoHNPZUNDc1q6vGq2R7ApoCgg/QyMQ8Wly0Vt4xZDYlQ2uKxmq9
MsbMYBSIH4G4MVrrmZlYha/x1WGbtrGqMiU96RJnlC0psxJdzeAi7qTqkz5ZuKR8
4kyM4bW7ja7Uy+cmlh7OwBK0bzwxzVM0xljmCQh9N7A2xog3LvtlG+VzYiTyfIdt
GmZDZYgKhvbwnM6EttpZVnOqYg0diXsOU4AOrNLsnF3Zu748su66tY6IKwAq5OHK
y2LPxsfKS2tLLi5z8YMjqCzqBsXmdZmIA5QdpHfRZSX4L8cpQyM3s2ABpg2O3Out
vQ4a4FkQfiwwQyqGIqX8XDtCq9ROZAMJL1R3jC/gSgZOXcPY4gY=
=4lpk
-----END PGP SIGNATURE-----

--lCQJCMiEL68sRdbd--