Add 9.4 and 9.5 patch branches

dmpgpro · dmpgpro · commit 0015ed9ea497 · 2016-11-07T15:56:56.000+03:00
diff --git a/patches/postgresql/9.4/perl522.patch b/patches/postgresql/9.4/perl522.patch
@@ -0,0 +1,29 @@
+diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
+index d7638b4..ccf1f76 100644
+--- a/src/tools/msvc/MSBuildProject.pm
++++ b/src/tools/msvc/MSBuildProject.pm
+@@ -345,6 +345,9 @@ EOF
+ 		$d =~ s/__CFGNAME__/$cfgname/g;
+ 		print $f "      <ModuleDefinitionFile>$d</ModuleDefinitionFile>\n";
+ 	}
++	if ($self->{name} =~ /plperl/ and $self->{platform} eq 'Win32') {
++		print $f "      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\n";
++	}
+ 	print $f <<EOF;
+     </Link>
+     <ResourceCompile>
+diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
+index 21faa58..7012bfa 100644
+--- a/src/tools/msvc/Mkvcbuild.pm
++++ b/src/tools/msvc/Mkvcbuild.pm
+@@ -572,8 +578,8 @@ sub mkvcbuild
+ 		}
+ 		$plperl->AddReference($postgres);
+ 		my @perl_libs =
+-		  grep { /perl\d+.lib$/ }
+-		  glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');
++		  grep { /perl\d+\.(lib|a)$/ }
++		  glob($solution->{options}->{perl} . '\lib\CORE\*.*');
+ 		if (@perl_libs == 1)
+ 		{
+ 			$plperl->AddLibrary($perl_libs[0]);
diff --git a/patches/postgresql/9.4/series b/patches/postgresql/9.4/series
@@ -0,0 +1 @@
+perl522.patch
diff --git a/patches/postgresql/9.5/perl522.patch b/patches/postgresql/9.5/perl522.patch
@@ -0,0 +1,29 @@
+diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
+index d7638b4..ccf1f76 100644
+--- a/src/tools/msvc/MSBuildProject.pm
++++ b/src/tools/msvc/MSBuildProject.pm
+@@ -345,6 +345,9 @@ EOF
+ 		$d =~ s/__CFGNAME__/$cfgname/g;
+ 		print $f "      <ModuleDefinitionFile>$d</ModuleDefinitionFile>\n";
+ 	}
++	if ($self->{name} =~ /plperl/ and $self->{platform} eq 'Win32') {
++		print $f "      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>\n";
++	}
+ 	print $f <<EOF;
+     </Link>
+     <ResourceCompile>
+diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
+index 21faa58..7012bfa 100644
+--- a/src/tools/msvc/Mkvcbuild.pm
++++ b/src/tools/msvc/Mkvcbuild.pm
+@@ -572,8 +578,8 @@ sub mkvcbuild
+ 		}
+ 		$plperl->AddReference($postgres);
+ 		my @perl_libs =
+-		  grep { /perl\d+.lib$/ }
+-		  glob($solution->{options}->{perl} . '\lib\CORE\perl*.lib');
++		  grep { /perl\d+\.(lib|a)$/ }
++		  glob($solution->{options}->{perl} . '\lib\CORE\*.*');
+ 		if (@perl_libs == 1)
+ 		{
+ 			$plperl->AddLibrary($perl_libs[0]);
diff --git a/patches/postgresql/9.5/series b/patches/postgresql/9.5/series
@@ -0,0 +1 @@
+perl522.patch
