On Wed, Nov 16, 2016 at 11:24 AM, Robert Haas <robertmhaas@gmail.com> wrote:
> diff --git a/contrib/pgcrypto/Makefile b/contrib/pgcrypto/Makefile
> index 805db76..ddb0183 100644
> --- a/contrib/pgcrypto/Makefile
> +++ b/contrib/pgcrypto/Makefile
> @@ -1,6 +1,6 @@
> # contrib/pgcrypto/Makefile
>
> -INT_SRCS = md5.c sha1.c sha2.c internal.c internal-sha2.c blf.c rijndael.c \
> +INT_SRCS = md5.c sha1.c internal.c internal-sha2.c blf.c rijndael.c \
> fortuna.c random.c pgp-mpi-internal.c imath.c
> INT_TESTS = sha2
I would like to do so. And while Linux is happy with that, macOS is
not, this results in linking resolution errors when compiling the
library.
> And for Mkvcbuild.pm I think you could just do this:
>
> diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
> index de764dd..1993764 100644
> --- a/src/tools/msvc/Mkvcbuild.pm
> +++ b/src/tools/msvc/Mkvcbuild.pm
> @@ -114,6 +114,15 @@ sub mkvcbuild
> md5.c pg_lzcompress.c pgfnames.c psprintf.c relpath.c rmtree.c
> string.c username.c wait_error.c);
>
> + if ($solution->{options}->{openssl})
> + {
> + push(@pgcommonallfiles, 'sha2_openssl.c');
> + }
> + else
> + {
> + push(@pgcommonallfiles, 'sha2.c');
> + }
> +
> our @pgcommonfrontendfiles = (
> @pgcommonallfiles, qw(fe_memutils.c file_utils.c
> restricted_token.c));
> @@ -422,7 +431,7 @@ sub mkvcbuild
> {
> $pgcrypto->AddFiles(
> 'contrib/pgcrypto', 'md5.c',
> - 'sha1.c', 'sha2.c',
> + 'sha1.c',
> 'internal.c', 'internal-sha2.c',
> 'blf.c', 'rijndael.c',
> 'fortuna.c', 'random.c',
>
> Is there some reason that won't work?
Yes we could do that for consistency with the other nix platforms. But
is that really necessary as libpgcommon already has those objects?
--
Michael