database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-28 23:42:10 +03:00
Code Activity

Support linking with MinGW-built Perl.

Browse Source 
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
This commit is contained in:
Noah Misch
2017-11-23 20:22:04 -08:00
parent 59b71c6fe6
commit 84c4313c6f
4 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pl/plperl/plperl.h
View File

@ -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

5
src/tools/msvc/Mkvcbuild.pm
View File

@ -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]);