[csw-devel] SF.net SVN: gar:[6298] csw/mgar/gar/v2-pbuild

[dmichelsen at users.sourceforge.net]

Revision: 6298
          http://gar.svn.sourceforge.net/gar/?rev=6298&view=rev
Author:   dmichelsen
Date:     2009-09-13 20:39:44 +0000 (Sun, 13 Sep 2009)

Log Message:
-----------
mGAR v2-pbuild: Fix merge rule

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

Modified: csw/mgar/gar/v2-pbuild/gar.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.mk	2009-09-13 19:10:36 UTC (rev 6297)
+++ csw/mgar/gar/v2-pbuild/gar.mk	2009-09-13 20:39:44 UTC (rev 6298)
@@ -153,22 +153,19 @@
 endef
 
 define _modulate_merge
-merge-$(2): $(3)
-merge-$(2): BUILDHOST=$$$$(call modulation2host)
+$(foreach ASSIGNMENT,$(3),
+merge-$(2): $(ASSIGNMENT)
+)
+merge-$(2): BUILDHOST=$$(call modulation2host)
 merge-$(2):
 	echo modulation: $(2)
 	echo vars: $(3)
-	echo ISA: $(ISA)
-	echo BUILDHOST=$(BUILDHOST)
-	echo BUILDHOST=$(call modulation2host)
-	echo BUILDHOST=$$(call modulation2host)
-	echo BUILDHOST=$(eval $(call modulation2host))
-	echo BUILDHOST=$$(eval $(call modulation2host))
-	echo BUILDHOST=$$(eval $$(call modulation2host))
-	echo THISHOST=$(THISHOST)
-	echo "Building modulation on host '$(BUILDHOST)'"
-	$(if $(and $(BUILDHOST),$(filter-out $(THISHOST),$(BUILDHOST))),\
-		ssh $(BUILDHOST) "gmake -C $(CURDIR) MODULATION=$(2) $(3) merge-modulated",\
+	echo ISA: $$(ISA)
+	echo BUILDHOST="$$(BUILDHOST)"
+	echo THISHOST="$$(THISHOST)"
+	echo "Building modulation on host '$$(BUILDHOST)'"
+	$$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\
+		ssh $$(BUILDHOST) "gmake -C $$(CURDIR) MODULATION=$(2) $(3) merge-modulated",\
 		gmake MODULATION=$(2) $(3) merge-modulated\
 	)
 	@# The next line has intentionally been left blank to explicitly terminate this make rule

Modified: csw/mgar/gar/v2-pbuild/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2-pbuild/gar.pkg.mk	2009-09-13 19:10:36 UTC (rev 6297)
+++ csw/mgar/gar/v2-pbuild/gar.pkg.mk	2009-09-13 20:39:44 UTC (rev 6298)
@@ -533,6 +533,17 @@
 # On a normal packaging workflow this is not used.
 prototypes: extract merge $(SPKG_DESTDIRS) pre-package $(foreach SPEC,$(_PKG_SPECS),$(WORKDIR)/$(SPEC).prototype-$(GARCH))
 
+# On these platforms packages are built.
+# They will include binaries for all ISAs that are specified for the platform.
+PACKAGING_PLATFORMS ?= solaris8-sparc solaris8-i386
+
+# Only override for testing purposes
+THIS_PLATFORM ?= solaris$(shell uname -r | sed -e 's/5.//')-$(shell uname -p)
+
+ifeq (,$(filter $(THIS_PLATFORM),$(PACKAGING_PLATFORMS)))
+  $(warn *** You are building a package on a non-requested platform ($(THIS_PLATFORM)). Requested platforms were $(PACKAGING_PLATFORMS))
+endif
+
 # We depend on extract as the additional package files (like .gspec) must be
 # unpacked to global/ for packaging. E. g. 'merge' depends only on the specific
 # modulations and does not fill global/.


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