Ticket #61588: patch-C-Compiler-Used-For-C++.diff

File patch-C-Compiler-Used-For-C++.diff, 15.8 KB (added by jptbtpj, 3 years ago)

Patch to ensure $(CCCMD) to points to a C++ compiler.

  • ./Makefile.PL

    old new  
    1111##              modify it under the same terms as Perl itself
    1212#############################################################################
    1313
     14package MY;
     15  sub const_config {
     16    my $inherited = shift->SUPER::const_config(@ARG);
     17    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     18    $inherited .= "\nXCC = $cc";
     19    $inherited;
     20  }
     21  sub const_cccmd {
     22    my $inherited = shift->SUPER::const_cccmd(@ARG);
     23    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     24    $inherited;
     25  }
     26
    1427package core;
    1528
    1629use 5.006001;
  • ./ext/aui/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429
    1530use Config;
  • ./ext/calendar/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429
    1530use Config;
  • ./ext/dataview/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429
    1530use Config;
  • ./ext/datetime/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/dnd/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/docview/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/filesys/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/grid/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/help/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/html/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/ipc/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/mdi/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/media/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/print/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/propgrid/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429
    1530use Config;
  • ./ext/ribbon/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429
    1530use Config;
  • ./ext/richtext/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429
    1530use Config;
  • ./ext/socket/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/stc/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/test/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;
  • ./ext/webview/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429
    1530use Config;
  • ./ext/xrc/Makefile.PL

    old new  
    1010##              modify it under the same terms as Perl itself
    1111#############################################################################
    1212
     13package MY;
     14  sub const_config {
     15    my $inherited = shift->SUPER::const_config(@ARG);
     16    my ($cc) = $inherited =~ m/\nCC\s*=\s*([^\n]*)/;
     17    $inherited .= "\nXCC = $cc";
     18    $inherited;
     19  }
     20  sub const_cccmd {
     21    my $inherited = shift->SUPER::const_cccmd(@ARG);
     22    $inherited =~ s/\$\(CC\)/\$(XCC)/;
     23    $inherited;
     24  }
     25
     26package main;
     27
    1328use strict;
    1429use lib '../../build';
    1530use Wx::build::MakeMaker;