move to own git serverHEADmaster

5 files changed, 494 insertions, 0 deletions

diff --git a/vcpkg/ports/libpq/windows/macro-def.patch b/vcpkg/ports/libpq/windows/macro-def.patch
new file mode 100644
index 0000000..1d16c12
--- /dev/null
+++ b/vcpkg/ports/libpq/windows/macro-def.patch
@@ -0,0 +1,18 @@
+diff --git a/src/include/common/checksum_helper.h b/src/include/common/checksum_helper.h
+index cac7570ea..d0ca1243c 100644
+--- a/src/include/common/checksum_helper.h
++++ b/src/include/common/checksum_helper.h
+@@ -33,7 +28,13 @@
+  */
+ typedef enum pg_checksum_type
+ {
++#pragma push_macro("CHECKSUM_TYPE_NONE")
++#ifdef CHECKSUM_TYPE_NONE
++// winioctl.h defines CHECKSUM_TYPE_NONE to 0 as a macro. 
++#undef CHECKSUM_TYPE_NONE
++#endif
+ 	CHECKSUM_TYPE_NONE,
++#pragma pop_macro("CHECKSUM_TYPE_NONE")
+ 	CHECKSUM_TYPE_CRC32C,
+ 	CHECKSUM_TYPE_SHA224,
+ 	CHECKSUM_TYPE_SHA256,
diff --git a/vcpkg/ports/libpq/windows/msbuild.patch b/vcpkg/ports/libpq/windows/msbuild.patch
new file mode 100644
index 0000000..e6c70ad
--- /dev/null
+++ b/vcpkg/ports/libpq/windows/msbuild.patch
@@ -0,0 +1,398 @@
+diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
+index 05548d7..097db91 100644
+--- a/src/tools/msvc/Install.pm
++++ b/src/tools/msvc/Install.pm
+@@ -53,6 +53,11 @@ sub Install
+ 	my $target = shift;
+ 	$insttype = shift;
+ 	$insttype = "all" unless ($insttype);
++	if ($insttype eq 'core')
++	{
++		$insttype = 'client';
++		@client_program_files = ( 'libecpg','libecpg_compat', 'libpgtypes', 'libpq' );
++	}
+ 
+ 	# if called from vcregress, the config will be passed to us
+ 	# so no need to re-include these
+@@ -89,7 +94,7 @@ sub Install
+ 	my $majorver = DetermineMajorVersion();
+ 	print "Installing version $majorver for $conf in $target\n";
+ 
+-	my @client_dirs = ('bin', 'lib', 'share', 'symbols');
++	my @client_dirs = ('bin', 'lib', 'share', 'tools', 'share/libpq', 'tools/libpq');
+ 	my @all_dirs = (
+ 		@client_dirs, 'doc', 'doc/contrib', 'doc/extension', 'share/contrib',
+ 		'share/extension', 'share/timezonesets', 'share/tsearch_data');
+@@ -117,11 +122,11 @@ sub Install
+ 			}
+ 		},
+ 		@top_dir);
+-	CopySetOfFiles('config files', $sample_files, $target . '/share/');
++	CopySetOfFiles('config files', $sample_files, $target . '/share/libpq/');
+ 	CopyFiles(
+ 		'Import libraries',
+ 		$target . '/lib/',
+-		"$conf\\", "postgres\\postgres.lib", "libpgcommon\\libpgcommon.lib",
++		"$conf\\", "libpgcommon\\libpgcommon.lib",
+ 		"libpgport\\libpgport.lib");
+ 	CopyContribFiles($config, $target);
+ 	CopyIncludeFiles($target);
+@@ -293,7 +298,16 @@ sub CopySolutionOutput
+ 		{
+ 			if ($1 == 1)
+ 			{
+-				push(@{ $install_list{'bin'} }, "exe");
++				push(@{ $install_list{'tools\\libpq'} }, "exe");
++			}
++			elsif ($1 == 2)
++			{
++				push(@{ $install_list{'bin'} }, "dll");
++				push(@{ $install_list{'lib'} }, "lib") if $is_sharedlib; # not for plugins
++			}
++			elsif ($is_sharedlib) # forced to static lib by vcpkg triplet
++			{
++				push(@{ $install_list{'lib'} }, "lib");
+ 			}
+ 			elsif ($1 == 2)
+ 			{
+@@ -317,7 +331,16 @@ sub CopySolutionOutput
+ 		{
+ 			if ($1 eq 'Application')
+ 			{
+-				push(@{ $install_list{'bin'} }, "exe");
++				push(@{ $install_list{'tools\\libpq'} }, "exe");
++			}
++			elsif ($1 eq 'DynamicLibrary')
++			{
++				push(@{ $install_list{'bin'} }, "dll");
++				push(@{ $install_list{'lib'} }, "lib") if $is_sharedlib; # not for plugins
++			}
++			elsif ($is_sharedlib) # forced to static lib by vcpkg triplet
++			{
++				push(@{ $install_list{'lib'} }, "lib");
+ 			}
+ 			elsif ($1 eq 'DynamicLibrary')
+ 			{
+@@ -350,7 +373,8 @@ sub CopySolutionOutput
+ 				  || croak "Could not copy $pf.$ext\n";
+ 			}
+ 		}
+-		lcopy("$conf\\$pf\\$pf.pdb", "$target\\symbols\\$pf.pdb")
++		$1 ne 'DynamicLibrary' ||
++		lcopy("$conf\\$pf\\$pf.pdb", "$target\\bin\\$pf.pdb")
+ 		  || croak "Could not copy $pf.pdb\n";
+ 		print ".";
+ 	}
+@@ -453,7 +477,7 @@ sub CopySubdirFiles
+ 		foreach my $f (split /\s+/, $flist)
+ 		{
+ 			lcopy("$subdir/$module/$f.control",
+-				"$target/share/extension/$f.control")
++				"$target/share/libpq/extension/$f.control")
+ 			  || croak("Could not copy file $f.control in contrib $module");
+ 			print '.';
+ 		}
+@@ -471,7 +495,7 @@ sub CopySubdirFiles
+ 		foreach my $f (split /\s+/, $flist)
+ 		{
+ 			lcopy("$subdir/$module/$f",
+-				"$target/share/$moduledir/" . basename($f))
++				"$target/share/libpq/$moduledir/" . basename($f))
+ 			  || croak("Could not copy file $f in contrib $module");
+ 			print '.';
+ 		}
+@@ -486,7 +510,7 @@ sub CopySubdirFiles
+ 		foreach my $f (split /\s+/, $flist)
+ 		{
+ 			lcopy("$subdir/$module/$f",
+-				"$target/share/tsearch_data/" . basename($f))
++				"$target/share/libpq/tsearch_data/" . basename($f))
+ 			  || croak("Could not copy file $f in $subdir $module");
+ 			print '.';
+ 		}
+@@ -549,7 +573,7 @@ sub CopySubdirFiles
+ 		  if ($module eq 'spi');
+ 		foreach my $f (split /\s+/, $flist)
+ 		{
+-			lcopy("$subdir/$module/$f", "$target/doc/$moduledir/$f")
++			lcopy("$subdir/$module/$f", "$target/share/libpq/doc/$moduledir/$f")
+ 			  || croak("Could not copy file $f in contrib $module");
+ 			print '.';
+ 		}
+@@ -675,7 +699,7 @@ sub GenerateNLSFiles
+ 	my $majorver = shift;
+ 
+ 	print "Installing NLS files...";
+-	EnsureDirectories($target, "share/locale");
++	EnsureDirectories($target, "share/libpq/locale");
+ 	my @flist;
+ 	File::Find::find(
+ 		{
+@@ -697,12 +721,12 @@ sub GenerateNLSFiles
+ 			next unless /([^\/]+)\.po/;
+ 			$lang = $1;
+ 
+-			EnsureDirectories($target, "share/locale/$lang",
+-				"share/locale/$lang/LC_MESSAGES");
++			EnsureDirectories($target, "share/libpq/locale/$lang",
++				"share/libpq/locale/$lang/LC_MESSAGES");
+ 			my @args = (
+-				"$nlspath\\bin\\msgfmt",
++				"msgfmt",
+ 				'-o',
+-				"$target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
++				"$target\\share\\libpq\\locale\\$lang\\LC_MESSAGES\\$prgm-$majorver.mo",
+ 				$_);
+ 			system(@args) && croak("Could not run msgfmt on $dir\\$_");
+ 			print ".";
+diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
+index 62fec1f..ecb1b86 100644
+--- a/src/tools/msvc/MSBuildProject.pm
++++ b/src/tools/msvc/MSBuildProject.pm
+@@ -80,14 +80,14 @@ EOF
+ 	print $f <<EOF;
+   </PropertyGroup>
+ EOF
+-
++    my $maybe_dll = $self->{solution}->{options}->{VCPKG_CRT_LINKAGE} eq 'dynamic' ? "DLL" : '';
+ 	$self->WriteItemDefinitionGroup(
+ 		$f, 'Debug',
+ 		{
+ 			defs => "_DEBUG;DEBUG=1",
+ 			opt => 'Disabled',
+ 			strpool => 'false',
+-			runtime => 'MultiThreadedDebugDLL'
++			runtime => 'MultiThreadedDebug' . $maybe_dll
+ 		});
+ 	$self->WriteItemDefinitionGroup(
+ 		$f,
+@@ -96,7 +96,7 @@ EOF
+ 			defs => "",
+ 			opt => 'Full',
+ 			strpool => 'true',
+-			runtime => 'MultiThreadedDLL'
++			runtime => 'MultiThreaded' . $maybe_dll
+ 		});
+ 	return;
+ }
+@@ -266,6 +266,8 @@ sub WriteConfigurationPropertyGroup
+ 	  ($self->{type} eq "exe")
+ 	  ? 'Application'
+ 	  : ($self->{type} eq "dll" ? 'DynamicLibrary' : 'StaticLibrary');
++	if ($self->{solution}->{options}->{VCPKG_LIBRARY_LINKAGE} eq 'static')
++	  { $cfgtype =~ s/DynamicLibrary/StaticLibrary/; }
+ 
+ 	print $f <<EOF;
+   <PropertyGroup Condition="'\$(Configuration)|\$(Platform)'=='$cfgname|$self->{platform}'" Label="Configuration">
+@@ -311,7 +313,9 @@ sub WriteItemDefinitionGroup
+ 	my $libs = $self->GetAdditionalLinkerDependencies($cfgname, ';');
+ 
+ 	my $targetmachine =
+-	  $self->{platform} eq 'Win32' ? 'MachineX86' : 'MachineX64';
++	  'Machine' . uc($self->{platform});
++	$targetmachine =~ s/WIN32/X86/;
++	my $randomizebase = ($self->{platform} =~ /^ARM/) ? 'true' : 'false';
+ 	my $arch = $self->{platform} eq 'Win32' ? 'x86' : 'x86_64';
+ 
+ 	my $includes = join ';', @{ $self->{includes} }, "";
+diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
+index 9e05eb9..8ac0a5d 100644
+--- a/src/tools/msvc/Mkvcbuild.pm
++++ b/src/tools/msvc/Mkvcbuild.pm
+@@ -125,8 +125,10 @@ sub mkvcbuild
+ 
+ 	if ($vsVersion >= '9.00')
+ 	{
++        if ($solution->{platform} !~ /^ARM/) {
+ 		push(@pgportfiles, 'pg_crc32c_sse42_choose.c');
+ 		push(@pgportfiles, 'pg_crc32c_sse42.c');
++        }
+ 		push(@pgportfiles, 'pg_crc32c_sb8.c');
+ 	}
+ 	else
+@@ -208,6 +210,7 @@ sub mkvcbuild
+ 		'syncrep_gram.y');
+ 	$postgres->AddFiles('src/backend/utils/adt', 'jsonpath_scan.l',
+ 		'jsonpath_gram.y');
++    ($config->{VCPKG_LIBRARY_LINKAGE} eq 'dynamic') &&
+ 	$postgres->AddDefine('BUILDING_DLL');
+ 	$postgres->AddLibrary('secur32.lib');
+ 	$postgres->AddLibrary('ws2_32.lib');
+@@ -252,12 +255,13 @@ sub mkvcbuild
+ 		$pltcl->AddIncludeDir($solution->{options}->{tcl} . '/include');
+ 		$pltcl->AddReference($postgres);
+ 
+-		for my $tclver (qw(86t 86 85 84))
++		my $v = $solution->{options}->{tcl_version};
++		for my $tclver ( ("${v}","${v}s","${v}sx") )
+ 		{
+ 			my $tcllib = $solution->{options}->{tcl} . "/lib/tcl$tclver.lib";
+ 			if (-e $tcllib)
+ 			{
+-				$pltcl->AddLibrary($tcllib);
++				$pltcl->AddLibrary("\$(VcpkgTcl${tclver}Libs)");
+ 				$found = 1;
+ 				last;
+ 			}
+@@ -512,8 +516,7 @@ sub mkvcbuild
+ 		  . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
+ 		my $prefixcmd =
+ 		  qq("$solution->{options}->{python}\\python" -c "$pythonprog");
+-		my $pyout = `$prefixcmd`;
+-		die "Could not query for python version!\n" if $?;
++        my $pyout = "$solution->{options}->{python}\n$solution->{options}->{python_version}";
+ 		my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
+ 
+ 		# Sometimes (always?) if python is not present, the execution
+@@ -529,8 +532,8 @@ sub mkvcbuild
+ 
+ 		my $plpython = $solution->AddProject('plpython' . $pymajorver,
+ 			'dll', 'PLs', 'src/pl/plpython');
+-		$plpython->AddIncludeDir($pyprefix . '/include');
+-		$plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
++		$plpython->AddIncludeDir($pyprefix . "/include/python$pyver");
++		$plpython->AddLibrary('$(VcpkgPythonLibs)');
+ 		$plpython->AddReference($postgres);
+ 
+ 		# Add transform modules dependent on plpython
+diff --git a/src/tools/msvc/Project.pm b/src/tools/msvc/Project.pm
+index 0507ad0..48caab9 100644
+--- a/src/tools/msvc/Project.pm
++++ b/src/tools/msvc/Project.pm
+@@ -167,6 +167,11 @@ sub AddReference
+ 		}
+ 		$self->AddLibrary(
+ 			"__CFGNAME__/" . $ref->{name} . "/" . $ref->{name} . ".lib");
++
++		if ($self->{solution}->{options}->{VCPKG_LIBRARY_LINKAGE} eq 'static')
++		{
++			map { $self->AddLibrary($_) } @{ $ref->{libraries} };
++		}
+ 	}
+ 	return;
+ }
+diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
+index b6d31c3..27d89fc 100644
+--- a/src/tools/msvc/Solution.pm
++++ b/src/tools/msvc/Solution.pm
+@@ -63,6 +63,11 @@ sub DeterminePlatform
+ 	my $self = shift;
+ 
+ 	if ($^O eq "MSWin32")
++	{
++		$self->{platform} = uc($self->{options}->{VCPKG_TARGET_ARCHITECTURE});
++		$self->{platform} =~ s/^X86$/Win32/;
++	}
++	elsif (0)
+ 	{
+ 		# Examine CL help output to determine if we are in 32 or 64-bit mode.
+ 		my $output = `cl /help 2>&1`;
+@@ -124,6 +129,9 @@ sub copyFile
+ sub GetOpenSSLVersion
+ {
+ 	my $self = shift;
++	if ($self->{options}->{openssl_version} =~ /(\d+)\.(\d+)\.(\d+)/m) {
++		return ($1, $2, $3);
++	}
+ 
+ 	# Attempt to get OpenSSL version and location.  This assumes that
+ 	# openssl.exe is in the specified directory.
+@@ -148,7 +156,7 @@ sub GetOpenSSLVersion
+ sub GenerateFiles
+ {
+ 	my $self = shift;
+-	my $bits = $self->{platform} eq 'Win32' ? 32 : 64;
++	my $bits          = $self->{platform} =~ /64/ ? 64 : 32;
+ 	my $ac_init_found = 0;
+ 	my $package_name;
+ 	my $package_version;
+@@ -440,7 +448,7 @@ sub GenerateFiles
+ 		USE_PAM => undef,
+ 		USE_SLICING_BY_8_CRC32C => undef,
+ 		USE_SSE42_CRC32C => undef,
+-		USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => 1,
++		USE_SSE42_CRC32C_WITH_RUNTIME_CHECK => $self->{platform} =~ /^ARM/ ? undef : 1,
+ 		USE_SYSTEMD => undef,
+ 		USE_SYSV_SEMAPHORES => undef,
+ 		USE_SYSV_SHARED_MEMORY => undef,
+@@ -725,14 +733,14 @@ sub GenerateFiles
+ 		  || confess "Could not open pg_config_paths.h";
+ 		print $o <<EOF;
+ #define PGBINDIR "/bin"
+-#define PGSHAREDIR "/share"
++#define PGSHAREDIR "/share/libpq"
+ #define SYSCONFDIR "/etc"
+ #define INCLUDEDIR "/include"
+ #define PKGINCLUDEDIR "/include"
+ #define INCLUDEDIRSERVER "/include/server"
+ #define LIBDIR "/lib"
+ #define PKGLIBDIR "/lib"
+-#define LOCALEDIR "/share/locale"
++#define LOCALEDIR "/share/libpq/locale"
+ #define DOCDIR "/doc"
+ #define HTMLDIR "/doc"
+ #define MANDIR "/man"
+@@ -957,11 +965,15 @@ sub AddProject
+ 	if ($self->{options}->{zlib})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{zlib} . '\include');
+-		$proj->AddLibrary($self->{options}->{zlib} . '\lib\zdll.lib');
++		$proj->AddLibrary('$(VcpkgZlibLibs)');
+ 	}
+ 	if ($self->{options}->{openssl})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{openssl} . '\include');
++		$proj->AddLibrary('$(VcpkgOpensslLibs)');
++	}
++	elsif (0)
++	{
+ 		my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion();
+ 
+ 		# Starting at version 1.1.0 the OpenSSL installers have
+@@ -1032,7 +1044,7 @@ sub AddProject
+ 	if ($self->{options}->{nls})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{nls} . '\include');
+-		$proj->AddLibrary($self->{options}->{nls} . '\lib\libintl.lib');
++		$proj->AddLibrary('$(VcpkgNlsLibs)');
+ 	}
+ 	if ($self->{options}->{gss})
+ 	{
+@@ -1065,6 +1077,10 @@ sub AddProject
+ 	if ($self->{options}->{icu})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{icu} . '\include');
++		$proj->AddLibrary('$(VcpkgIcuLibs)');
++	}
++	elsif (0)
++	{
+ 		if ($self->{platform} eq 'Win32')
+ 		{
+ 			$proj->AddLibrary($self->{options}->{icu} . '\lib\icuin.lib');
+@@ -1082,22 +1098,22 @@ sub AddProject
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{xml} . '\include');
+ 		$proj->AddIncludeDir($self->{options}->{xml} . '\include\libxml2');
+-		$proj->AddLibrary($self->{options}->{xml} . '\lib\libxml2.lib');
++		$proj->AddLibrary('$(VcpkgXmlLibs)');
+ 	}
+ 	if ($self->{options}->{xslt})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{xslt} . '\include');
+-		$proj->AddLibrary($self->{options}->{xslt} . '\lib\libxslt.lib');
++		$proj->AddLibrary('$(VcpkgXsltLibs)');
+ 	}
+ 	if ($self->{options}->{lz4})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{lz4} . '\include');
+-		$proj->AddLibrary($self->{options}->{lz4} . '\lib\liblz4.lib');
++		$proj->AddLibrary('$(VcpkgLz4Libs)');
+ 	}
+ 	if ($self->{options}->{zstd})
+ 	{
+ 		$proj->AddIncludeDir($self->{options}->{zstd} . '\include');
+-		$proj->AddLibrary($self->{options}->{zstd} . '\lib\libzstd.lib');
++		$proj->AddLibrary('$(VcpkgZstdLibs)');
+ 	}
+ 	if ($self->{options}->{uuid})
+ 	{
diff --git a/vcpkg/ports/libpq/windows/spin_delay.patch b/vcpkg/ports/libpq/windows/spin_delay.patch
new file mode 100644
index 0000000..163e8e6
--- /dev/null
+++ b/vcpkg/ports/libpq/windows/spin_delay.patch
@@ -0,0 +1,24 @@
+diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
+index 4d3ffc7..658b1a1 100644
+--- a/src/include/storage/s_lock.h
++++ b/src/include/storage/s_lock.h
+@@ -953,12 +953,18 @@ typedef LONG slock_t;
+ /* If using Visual C++ on Win64, inline assembly is unavailable.
+  * Use a _mm_pause intrinsic instead of rep nop.
+  */
+-#if defined(_WIN64)
++#if defined(_M_X64) && !defined(_M_ARM64EC)
+ static __forceinline void
+ spin_delay(void)
+ {
+ 	_mm_pause();
+ }
++#elif defined(_M_ARM) || defined(_M_ARM64) || defined(_M_ARM64EC)
++static __forceinline void
++spin_delay(void)
++{
++	__yield();
++}
+ #else
+ static __forceinline void
+ spin_delay(void)
diff --git a/vcpkg/ports/libpq/windows/tcl-9.0-alpha.patch b/vcpkg/ports/libpq/windows/tcl-9.0-alpha.patch
new file mode 100644
index 0000000..154efcb
--- /dev/null
+++ b/vcpkg/ports/libpq/windows/tcl-9.0-alpha.patch
@@ -0,0 +1,12 @@
+diff -Naur postgresql-16.9/src/pl/tcl/pltcl.c postgresql-16.9-vcpkg/src/pl/tcl/pltcl.c
+--- postgresql-16.9/src/pl/tcl/pltcl.c	2025-05-05 22:30:08.000000000 +0200
++++ postgresql-16.9-vcpkg/src/pl/tcl/pltcl.c	2025-05-23 22:53:43.485828671 +0200
+@@ -56,7 +56,7 @@
+ #define CONST86
+ #endif
+ 
+-#if !HAVE_TCL_VERSION(8,7)
++#if !HAVE_TCL_VERSION(8,7) || (TCL_MAJOR_VERSION == 9 && TCL_MINOR_VERSION == 0 && TCL_RELEASE_LEVEL == TCL_ALPHA_RELEASE)
+ typedef int Tcl_Size;
+ #endif
+ 
diff --git a/vcpkg/ports/libpq/windows/win_bison_flex.patch b/vcpkg/ports/libpq/windows/win_bison_flex.patch
new file mode 100644
index 0000000..fc82301
--- /dev/null
+++ b/vcpkg/ports/libpq/windows/win_bison_flex.patch
@@ -0,0 +1,42 @@
+diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl
+index 25df669..373bedd 100644
+--- a/src/tools/msvc/pgbison.pl
++++ b/src/tools/msvc/pgbison.pl
+@@ -13,7 +13,7 @@ use File::Basename;
+ 
+ do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl';
+ 
+-my ($bisonver) = `bison -V`;                 # grab first line
++my ($bisonver) = `win_bison -V`;    # grab first line
+ $bisonver = (split(/\s+/, $bisonver))[3];    # grab version number
+ 
+ unless ($bisonver ge '2.3')
+@@ -51,5 +51,5 @@ my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : '');
+ 
+ my $nodep = $bisonver ge '3.0' ? "-Wno-deprecated" : "";
+ 
+-system("bison $nodep $headerflag $input -o $output");
++system("win_bison $nodep $headerflag $input -o $output");
+ exit $? >> 8;
+diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
+index c308a08..0807ce7 100644
+--- a/src/tools/msvc/pgflex.pl
++++ b/src/tools/msvc/pgflex.pl
+@@ -16,7 +16,7 @@ $ENV{CYGWIN} = 'nodosfilewarning';
+ 
+ do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl';
+ 
+-my ($flexver) = `flex -V`;    # grab first line
++my ($flexver) = `win_flex -V`;    # grab first line
+ $flexver = (split(/\s+/, $flexver))[1];
+ $flexver =~ s/[^0-9.]//g;
+ my @verparts = split(/\./, $flexver);
+@@ -52,7 +52,7 @@ close($mf);
+ my $basetarg = basename($output);
+ my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : '');
+ 
+-system("flex $flexflags -o$output $input");
++system("win_flex $flexflags -o$output $input");
+ if ($? == 0)
+ {
+