Update of /cvsroot/fink/fink/perlmod/Fink
In directory vz-cvs-3.sog:/tmp/cvs-serv10132
Modified Files:
ChangeLog PkgVersion.pm
Log Message:
MAKEFLAGS "last wins", so give priority to SetMAKEFLAGS over MaxBuildJobs
(.info has maximum control)
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.670
retrieving revision 1.671
diff -u -d -r1.670 -r1.671
--- PkgVersion.pm 2 Aug 2011 16:39:39 -0000 1.670
+++ PkgVersion.pm 5 Aug 2011 00:11:25 -0000 1.671
@@ -5185,13 +5185,16 @@
}
}
- # UseMaxBuildJobs: true overrides SetNoMAKEFLAGS
# If UseMaxBuildJobs is absent or set to True, turn on MaxBuildJobs
+ # UseMaxBuildJobs:true (explicit or absent) overrides SetNoMAKEFLAGS
+ # but SetMAKEFLAGS values override MaxBuildJobs
if ((!$self->has_param('UseMaxBuildJobs') ||
$self->param_boolean('UseMaxBuildJobs')) && $config->has_param('MaxBuildJobs'))
{
my $mbj = $config->param('MaxBuildJobs');
if ($mbj =~ /^\d+$/ && $mbj > 0) {
if (defined $script_env{'MAKEFLAGS'}) {
- $script_env{'MAKEFLAGS'} .= " -j$mbj";
+ # append (MAKEFLAGS has right-to-left
precedence,
+ # unlike compiler *FLAGS variables)
+ $script_env{'MAKEFLAGS'} = "-j$mbj " .
$script_env{'MAKEFLAGS'};
} else {
$script_env{'MAKEFLAGS'} = "-j$mbj";
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1730
retrieving revision 1.1731
diff -u -d -r1.1730 -r1.1731
--- ChangeLog 2 Aug 2011 16:39:17 -0000 1.1730
+++ ChangeLog 5 Aug 2011 00:11:25 -0000 1.1731
@@ -1,3 +1,8 @@
+2011-08-04 Daniel Macks <[email protected]>
+
+ * PkgVersion.pm: MaxBuildJobs flag _pre_pends to
+ SetMAKEFLAGS (give priority to local .info flag)
+
2011-07-20 Daniel Macks <[email protected]>
* PkgVersion.pm: MAKEFLAGS:-j1 during InstallScript even if
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
