Trying to fix 9.5.1 1C patches

slaykovsky · slaykovsky · commit f8b5a4c2959b · 2016-03-15T13:02:30.000+03:00
diff --git a/patches/postgresql/9.5.1/65-1c_FULL_95-0.23.1 b/patches/postgresql/9.5.1/65-1c_FULL_95-0.23.1
@@ -9142,16 +9142,24 @@ index b99fb13..582e5d6 100644
  -- Test ORDER BY options
  --
 
-diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
-index 21faa58..d104dbc 100644
---- a/src/tools/msvc/Mkvcbuild.pm
-+++ b/src/tools/msvc/Mkvcbuild.pm
+diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm.new
+index 21faa58..3aabd57 100644
+--- a/postgresql-9.5.1/src/tools/msvc/Mkvcbuild.pm
++++ b/postgresql-9.5.1/src/tools/msvc/Mkvcbuild.pm.new
+@@ -33,7 +33,7 @@ my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
+ my @contrib_uselibpq = ('dblink', 'oid2name', 'postgres_fdw', 'vacuumlo');
+ my @contrib_uselibpgport   = ('oid2name', 'pg_standby', 'vacuumlo');
+ my @contrib_uselibpgcommon = ('oid2name', 'pg_standby', 'vacuumlo');
+-my $contrib_extralibs      = undef;
++my $contrib_extralibs      = {'mchar' => ['icuin.lib', 'icuuc.lib']};
+ my $contrib_extraincludes =
+   { 'tsearch2' => ['contrib/tsearch2'], 'dblink' => ['src/backend'] };
+ my $contrib_extrasource = {
 @@ -58,6 +58,7 @@ my $frontend_extralibs = {
- 	'initdb'     => ['ws2_32.lib'],
- 	'pg_restore' => ['ws2_32.lib'],
- 	'pgbench'    => ['ws2_32.lib'],
-+	'mchar'		 => ['icuin.lib', 'icuuc.lib'],
- 	'psql'       => ['ws2_32.lib'] };
- my $contrib_extralibs = { 'pgbench' => ['wsock32.lib'], 'mchar' => ['icuin.lib', 'icuuc.lib'] };
+        'initdb'     => ['ws2_32.lib'],
+        'pg_restore' => ['ws2_32.lib'],
+        'pgbench'    => ['ws2_32.lib'],
++       'mchar'      => ['icuin.lib', 'icuuc.lib'],
+        'psql'       => ['ws2_32.lib'] };
  my $frontend_extraincludes = {
- 	'initdb' => ['src/timezone'],
+        'initdb' => ['src/timezone'],
