[csw-devel] SF.net SVN: gar:[8653] csw/mgar/gar/v2/gar.pkg.mk

[dmichelsen at users.sourceforge.net]

Revision: 8653
          http://gar.svn.sourceforge.net/gar/?rev=8653&view=rev
Author:   dmichelsen
Date:     2010-02-18 14:59:35 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
mGAR v2: Use only one platform when building ARCHALL packages. This fixes #11

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.pkg.mk

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-02-18 14:08:57 UTC (rev 8652)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-02-18 14:59:35 UTC (rev 8653)
@@ -820,8 +820,9 @@
 
 # This rule automatically logs into every host where a package for this software should
 # be built. It is especially suited for automated build bots.
+platforms: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS))
 platforms:
-	$(foreach P,$(PACKAGING_PLATFORMS),\
+	$(foreach P,$(_PACKAGING_PLATFORMS),\
 		$(if $(PACKAGING_HOST_$P),\
 			$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
 				$(MAKE) PLATFORM=$P _package && ,\
@@ -833,8 +834,9 @@
 	@echo
 	@echo "The following packages have been built during this invocation:"
 	@echo
-	@$(foreach P,$(PACKAGING_PLATFORMS),\
+	@$(foreach P,$(_PACKAGING_PLATFORMS),\
 		echo "* Platform $P\c";\
+		$(if $(ARCHALL),echo " (suitable for all architectures)\c";) \
 		$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
 			echo " (built on this host)";\
 			  $(MAKE) -s PLATFORM=$P _pkgshow;echo;,\
@@ -844,11 +846,12 @@
 	)
 	@$(MAKECOOKIE)
 
+platforms-%: _PACKAGING_PLATFORMS=$(if $(ARCHALL),$(firstword $(PACKAGING_PLATFORMS)),$(PACKAGING_PLATFORMS))
 platforms-%:
-	$(foreach P,$(PACKAGING_PLATFORMS),\
+	$(foreach P,$(_PACKAGING_PLATFORMS),\
 		$(if $(PACKAGING_HOST_$P),\
 			$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
-				$(MAKE) PLATFORM=$P $* && ,\
+				$(MAKE) -s PLATFORM=$P $* && ,\
 				$(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \
 			),\
 			$(error *** No host has been defined for platform $P)\


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.