diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2010-05-13 21:33:00 +0000 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2010-05-13 21:33:00 +0000 |
| commit | 2a73ee59dbdeb7bf05ff1b3fadb28992245904e0 (patch) | |
| tree | 7ec727e1fffe5c10ec4691da3889e8b669ae2e50 /src | |
| parent | 20db9591b241281b0bcc5871418befffca4095a6 (diff) | |
| download | postgresql-2a73ee59dbdeb7bf05ff1b3fadb28992245904e0.tar.gz postgresql-2a73ee59dbdeb7bf05ff1b3fadb28992245904e0.zip | |
Fix MSVC builds for recent plperl changes. Go back to version 8.2, which is
where we started supporting MSVC builds.
Security: CVE-2010-1169
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm index 4eb2eee2bc4..1e495e05f63 100644 --- a/src/tools/msvc/Mkvcbuild.pm +++ b/src/tools/msvc/Mkvcbuild.pm @@ -3,7 +3,7 @@ package Mkvcbuild; # # Package that generates build files for msvc build # -# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.56 2010/05/13 15:56:22 mha Exp $ +# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.57 2010/05/13 21:33:00 adunstan Exp $ # use Carp; use Win32; @@ -118,8 +118,7 @@ sub mkvcbuild } } if ( Solution::IsNewer('src\pl\plperl\perlchunks.h','src\pl\plperl\plc_perlboot.pl') - ||Solution::IsNewer('src\pl\plperl\perlchunks.h','src\pl\plperl\plc_safe_bad.pl') - ||Solution::IsNewer('src\pl\plperl\perlchunks.h','src\pl\plperl\plc_safe_ok.pl')) + ||Solution::IsNewer('src\pl\plperl\perlchunks.h','src\pl\plperl\plc_trusted.pl')) { print 'Building src\pl\plperl\perlchunks.h ...' . "\n"; my $basedir = getcwd; @@ -128,7 +127,7 @@ sub mkvcbuild . '/bin/perl ' . 'text2macro.pl ' . '--strip="^(\#.*|\s*)$$" ' - . 'plc_perlboot.pl plc_safe_bad.pl plc_safe_ok.pl ' + . 'plc_perlboot.pl plc_trusted.pl ' . '>perlchunks.h'); chdir $basedir; if ((!(-f 'src\pl\plperl\perlchunks.h')) || -z 'src\pl\plperl\perlchunks.h') @@ -137,6 +136,22 @@ sub mkvcbuild die 'Failed to create perlchunks.h' . "\n"; } } + if ( Solution::IsNewer('src\pl\plperl\plperl_opmask.h','src\pl\plperl\plperl_opmask.pl')) + { + print 'Building src\pl\plperl\plperl_opmask.h ...' . "\n"; + my $basedir = getcwd; + chdir 'src\pl\plperl'; + system( $solution->{options}->{perl} + . '/bin/perl ' + . 'plperl_opmask.pl ' + . 'plperl_opmask.h'); + chdir $basedir; + if ((!(-f 'src\pl\plperl\plperl_opmask.h')) || -z 'src\pl\plperl\plperl_opmask.h') + { + unlink('src\pl\plperl\plperl_opmask.h'); # if zero size + die 'Failed to create plperl_opmask.h' . "\n"; + } + } $plperl->AddReference($postgres); my @perl_libs = grep {/perl\d+.lib$/ }glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib'); |