From f16a0958d0ebebf9b4c3fc2272c3e1aa4ae3a1d2 Mon Sep 17 00:00:00 2001
From: Noah Misch <noah@leadboat.com>
Date: Thu, 23 Nov 2017 20:22:04 -0800
Subject: [PATCH] Support linking with MinGW-built Perl.
This is necessary for ActivePerl 5.18 onwards and for Strawberry Perl.
It is not sufficient for 32-bit builds with newer Visual Studio; these
fail with error LINK2026. Back-patch to 9.3 (all supported versions).
Reported by Victor Wagner.
Discussion: https://postgr.es/m/20160326154321.7754ab8f@wagner.wagner.home
---
config/perl.m4 | 17 ++++++++++++-----
configure | 17 ++++++++++++-----
src/pl/plperl/plperl.h | 8 ++++++++
src/tools/msvc/Mkvcbuild.pm | 5 +++--
4 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/config/perl.m4 b/config/perl.m4
index 8c21d0fb395..76b1a92e3a0 100644
--- a/config/perl.m4
+++ b/config/perl.m4
@@ -83,12 +83,19 @@ AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],
[AC_REQUIRE([PGAC_PATH_PERL])
AC_MSG_CHECKING(for flags to link embedded Perl)
if test "$PORTNAME" = "win32" ; then
-perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
-test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+ perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
+ if test -e "$perl_archlibexp/CORE/$perl_lib.lib"; then
+ perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+ else
+ perl_lib=`basename $perl_archlibexp/CORE/libperl[[5-9]]*.a .a | sed 's/^lib//'`
+ if test -e "$perl_archlibexp/CORE/lib$perl_lib.a"; then
+ perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+ fi
+ fi
else
-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
+ pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+ pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+ perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
fi
AC_SUBST(perl_embed_ldflags)dnl
if test -z "$perl_embed_ldflags" ; then
diff --git a/configure b/configure
index 883e1ba0af9..853b375fc57 100755
--- a/configure
+++ b/configure
@@ -7874,12 +7874,19 @@ $as_echo "$perl_embed_ccflags" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to link embedded Perl" >&5
$as_echo_n "checking for flags to link embedded Perl... " >&6; }
if test "$PORTNAME" = "win32" ; then
-perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
-test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+ perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
+ if test -e "$perl_archlibexp/CORE/$perl_lib.lib"; then
+ perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+ else
+ perl_lib=`basename $perl_archlibexp/CORE/libperl[5-9]*.a .a | sed 's/^lib//'`
+ if test -e "$perl_archlibexp/CORE/lib$perl_lib.a"; then
+ perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+ fi
+ fi
else
-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
+ pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+ pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+ perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
fi
if test -z "$perl_embed_ldflags" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
index c4e06d089f4..aac95f8d2ce 100644
--- a/src/pl/plperl/plperl.h
+++ b/src/pl/plperl/plperl.h
@@ -42,6 +42,14 @@
#undef vsnprintf
#endif
+/*
+ * ActivePerl 5.18 and later are MinGW-built, and their headers use GCC's
+ * __inline__. Translate to something MSVC recognizes.
+ */
+#ifdef _MSC_VER
+#define __inline__ inline
+#endif
+
/*
* Get the basic Perl API. We use PERL_NO_GET_CONTEXT mode so that our code
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 686c7369f68..4c2e12e2289 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -615,9 +615,10 @@ sub mkvcbuild
}
}
$plperl->AddReference($postgres);
- my $perl_path = $solution->{options}->{perl} . '\lib\CORE\perl*.lib';
+ my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*perl*';
+ # ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
my @perl_libs =
- grep { /perl\d+.lib$/ } glob($perl_path);
+ grep { /perl\d+\.lib$|libperl\d+\.a$/ } glob($perl_path);
if (@perl_libs == 1)
{
$plperl->AddLibrary($perl_libs[0]);
--
GitLab