[Gpg4win-commits] r1093 - in trunk: . src

[scm-commit@wald.intevation.org]

Author: mmutz
Date: 2009-02-06 14:38:42 +0100 (Fri, 06 Feb 2009)
New Revision: 1093

Modified:
   trunk/ChangeLog
   trunk/src/gpg4win.mk.in
Log:
2009-02-06  Marc Mutz <marc at kdab.net>

	* src/gpg4win.mk.in: Inject $(GPG4WIN_PARALLEL) for building
	individual packages. Try twice with it, once without, before
	finally failing. Speeds up builds on n-core machines, n>1.

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-02-06 10:20:45 UTC (rev 1092)
+++ trunk/ChangeLog	2009-02-06 13:38:42 UTC (rev 1093)
@@ -1,3 +1,9 @@
+2009-02-06  Marc Mutz <marc at kdab.net>
+
+	* src/gpg4win.mk.in: Inject $(GPG4WIN_PARALLEL) for building
+	individual packages. Try twice with it, once without, before
+	finally failing. Speeds up builds on n-core machines, n>1.
+
 2009-02-06  Emanuel Schuetze  <emanuel.schuetze at intevation.de>
 
 	* packages/packages.current: Update kleopatra and kdelibs. Clear

Modified: trunk/src/gpg4win.mk.in
===================================================================
--- trunk/src/gpg4win.mk.in	2009-02-06 10:20:45 UTC (rev 1092)
+++ trunk/src/gpg4win.mk.in	2009-02-06 13:38:42 UTC (rev 1093)
@@ -137,6 +137,8 @@
 stamps/stamp-$(1)-03-make: stamps/stamp-$(1)-02-configure
 	($(call SETVARS,$(1));				\
 	  cd "$$$${pkgbdir}";				\
+	  $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
+	  $(MAKE) $(AM_MAKEFLAGS) $(GPG4WIN_PARALLEL) $$$${pkgmkargs} || \
 	  $(MAKE) $(AM_MAKEFLAGS) $$$${pkgmkargs})
 	touch stamps/stamp-$(1)-03-make