ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/libpq/patches/windows/win_bison_flex.patch

   1 diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
   2 index aceed5ffd..f6ed215e8 100644
   3 --- a/src/tools/msvc/pgflex.pl
   4 +++ b/src/tools/msvc/pgflex.pl
   5 @@ -12,7 +12,7 @@ $ENV{CYGWIN} = 'nodosfilewarning';
   6
   7  do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl';
   8
   9 -my ($flexver) = `flex -V`;    # grab first line
  10 +my ($flexver) = `win_flex -V`;    # grab first line
  11  $flexver = (split(/\s+/, $flexver))[1];
  12  $flexver =~ s/[^0-9.]//g;
  13  my @verparts = split(/\./, $flexver);
  14 @@ -48,7 +47,7 @@ close($mf);
  15  my $basetarg = basename($output);
  16  my $flexflags = ($make =~ /^$basetarg:\s*FLEXFLAGS\s*=\s*(\S.*)/m ? $1 : '');
  17
  18 -system("flex $flexflags -o$output $input");
  19 +system("win_flex $flexflags -o$output $input");
  20  if ($? == 0)
  21  {
  22
  23 diff --git a/src/tools/msvc/pgbison.pl b/src/tools/msvc/pgbison.pl
  24 index 895e398c0..f5b524a5d 100644
  25 --- a/src/tools/msvc/pgbison.pl
  26 +++ b/src/tools/msvc/pgbison.pl
  27 @@ -9,7 +9,7 @@ use File::Basename;
  28
  29  do './src/tools/msvc/buildenv.pl' if -e 'src/tools/msvc/buildenv.pl';
  30
  31 -my ($bisonver) = `bison -V`;    # grab first line
  32 +my ($bisonver) = `win_bison -V`;    # grab first line
  33  $bisonver = (split(/\s+/, $bisonver))[3];    # grab version number
  34
  35  unless ($bisonver eq '1.875' || $bisonver ge '2.2')
  36 @@ -45,5 +45,5 @@ close($mf);
  37  my $basetarg = basename($output);
  38  my $headerflag = ($make =~ /^$basetarg:\s+BISONFLAGS\b.*-d/m ? '-d' : '');
  39
  40 -system("bison $headerflag $input -o $output");
  41 +system("win_bison $headerflag $input -o $output");
  42  exit $? >> 8;
  43