[csw-devel] SF.net SVN: gar:[8768] csw/mgar/gar/v2
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Tue Feb 23 20:36:41 CET 2010
Revision: 8768
http://gar.svn.sourceforge.net/gar/?rev=8768&view=rev
Author: wahwah
Date: 2010-02-23 19:36:38 +0000 (Tue, 23 Feb 2010)
Log Message:
-----------
mGAR v2: Renaming PLATFORM to GAR_PLATFORM to avoid problems with brittle nonstandard build systems (NSS, in particular).
Modified Paths:
--------------
csw/mgar/gar/v2/gar.conf.mk
csw/mgar/gar/v2/gar.mk
csw/mgar/gar/v2/gar.pkg.mk
Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk 2010-02-23 15:49:33 UTC (rev 8767)
+++ csw/mgar/gar/v2/gar.conf.mk 2010-02-23 19:36:38 UTC (rev 8768)
@@ -24,11 +24,11 @@
# invoked from "gmake platforms" or when you build a package on a host
# that is suitable for the platform.
# If there are no platform hosts defined the feature is disabled.
-PLATFORM ?= $(firstword $(foreach P,$(PACKAGING_PLATFORMS),$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),$P)))
+GAR_PLATFORM ?= $(firstword $(foreach P,$(PACKAGING_PLATFORMS),$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),$P)))
MODULATION ?= global
FILEDIR ?= files
-WORKROOTDIR ?= $(if $(PLATFORM),work/$(PLATFORM),work)
+WORKROOTDIR ?= $(if $(GAR_PLATFORM),work/$(GAR_PLATFORM),work)
WORKDIR ?= $(WORKROOTDIR)/build-$(MODULATION)
WORKDIR_FIRSTMOD ?= $(WORKROOTDIR)/build-$(firstword $(MODULATIONS))
DOWNLOADDIR ?= $(WORKROOTDIR)/download
Modified: csw/mgar/gar/v2/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk 2010-02-23 15:49:33 UTC (rev 8767)
+++ csw/mgar/gar/v2/gar.mk 2010-02-23 19:36:38 UTC (rev 8768)
@@ -135,8 +135,8 @@
merge-$(2):
@echo "[===== Building modulation '$(2)' on host '$$(BUILDHOST)' =====]"
$$(if $$(and $$(BUILDHOST),$$(filter-out $$(THISHOST),$$(BUILDHOST))),\
- $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\
- $(MAKE) $(if $(PLATFORM),PLATFORM=$(PLATFORM)) MODULATION=$(2) $(3) merge-modulated\
+ $(SSH) $$(BUILDHOST) "PATH=$$(PATH) $(MAKE) -C $$(CURDIR) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated",\
+ $(MAKE) $(if $(GAR_PLATFORM),GAR_PLATFORM=$(GAR_PLATFORM)) MODULATION=$(2) $(3) merge-modulated\
)
@# The next line has intentionally been left blank to explicitly terminate this make rule
Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk 2010-02-23 15:49:33 UTC (rev 8767)
+++ csw/mgar/gar/v2/gar.pkg.mk 2010-02-23 19:36:38 UTC (rev 8768)
@@ -766,7 +766,7 @@
@echo
@echo "The following packages have been built:"
@echo
- @$(MAKE) -s PLATFORM=$(PLATFORM) _pkgshow
+ @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _pkgshow
@echo
@$(DONADA)
@@ -775,7 +775,7 @@
dirpackage: _package
@echo "The following packages have been built:"
@echo
- @$(MAKE) -s PLATFORM=$(PLATFORM) _dirpkgshow
+ @$(MAKE) -s GAR_PLATFORM=$(GAR_PLATFORM) _dirpkgshow
@echo
@$(DONADA)
@@ -840,8 +840,8 @@
$(foreach P,$(_PACKAGING_PLATFORMS),\
$(if $(PACKAGING_HOST_$P),\
$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
- $(MAKE) PLATFORM=$P _package && ,\
- $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P _package" && \
+ $(MAKE) GAR_PLATFORM=$P _package && ,\
+ $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_PLATFORM=$P _package" && \
),\
$(error *** No host has been defined for platform $P)\
)\
@@ -854,9 +854,9 @@
$(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;,\
+ $(MAKE) -s GAR_PLATFORM=$P _pkgshow;echo;,\
echo " (built on host '$(PACKAGING_HOST_$P)')";\
- $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s PLATFORM=$P _pkgshow";echo;\
+ $(SSH) $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) -s GAR_PLATFORM=$P _pkgshow";echo;\
)\
)
@$(MAKECOOKIE)
@@ -866,8 +866,8 @@
$(foreach P,$(_PACKAGING_PLATFORMS),\
$(if $(PACKAGING_HOST_$P),\
$(if $(filter $(THISHOST),$(PACKAGING_HOST_$P)),\
- $(MAKE) -s PLATFORM=$P $* && ,\
- $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) PLATFORM=$P $*" && \
+ $(MAKE) -s GAR_PLATFORM=$P $* && ,\
+ $(SSH) -t $(PACKAGING_HOST_$P) "PATH=$$PATH:/opt/csw/bin $(MAKE) -C $(CURDIR) GAR_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.
More information about the devel
mailing list