Hello all,

the extension modules (TestUpgrade etc.) in the buildfarm client do not use the "make" command override defined in the config file, instead hardcoding command lines using "make". This fails where make is not GNU make.

Patch attached, which fixes the problem on jaguarundi.

--
Christian
*** /tmp/qvZogO_FileTextArrayFDW.pm     2012-12-04 08:31:46.878698514 +0100
--- PGBuild/Modules/FileTextArrayFDW.pm 2012-12-04 08:29:35.653265999 +0100
***************
*** 119,125 ****
  
      print main::time_str(), "building $MODULE\n" if   $verbose;
  
!     my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1";
  
      my @makeout = `cd $self->{where} && $cmd 2>&1`;
  
--- 119,125 ----
  
      print main::time_str(), "building $MODULE\n" if   $verbose;
  
!     my $cmd = "PATH=../inst:$ENV{PATH} $self->{bfconf}->{make} USE_PGXS=1";
  
      my @makeout = `cd $self->{where} && $cmd 2>&1`;
  
***************
*** 136,142 ****
  
      print main::time_str(), "installing $MODULE\n" if $verbose;
  
!     my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1 install";
  
      my @log = `cd $self->{where} && $cmd 2>&1`;
  
--- 136,142 ----
  
      print main::time_str(), "installing $MODULE\n" if $verbose;
  
!     my $cmd = "PATH=../inst:$ENV{PATH} $self->{bfconf}->{make} USE_PGXS=1 
install";
  
      my @log = `cd $self->{where} && $cmd 2>&1`;
  
***************
*** 161,167 ****
  
      print main::time_str(), "install-checking $MODULE\n" if   $verbose;
  
!     my $cmd = "PATH=../inst:$ENV{PATH} make USE_PGXS=1 installcheck";
  
      my @log = `cd $self->{where} && $cmd 2>&1`;
  
--- 161,167 ----
  
      print main::time_str(), "install-checking $MODULE\n" if   $verbose;
  
!     my $cmd = "PATH=../inst:$ENV{PATH} $self->{bfconf}->{make} USE_PGXS=1 
installcheck";
  
      my @log = `cd $self->{where} && $cmd 2>&1`;
  
*** /tmp/3XAamk_TestUpgrade.pm  2012-12-04 08:31:46.886698485 +0100
--- PGBuild/Modules/TestUpgrade.pm      2012-12-04 08:28:38.007735375 +0100
***************
*** 67,73 ****
      }
      else
      {
!         my $cmd = "cd $self->{pgsql}/contrib/pg_upgrade && make check";
          @checklog = `$cmd 2>&1`;
      }
  
--- 67,73 ----
      }
      else
      {
!         my $cmd = "cd $self->{pgsql}/contrib/pg_upgrade && 
$self->{bfconf}->{make} check";
          @checklog = `$cmd 2>&1`;
      }
  
-- 
Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-hackers

Reply via email to