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

[skayser at users.sourceforge.net]

Revision: 8790
          http://gar.svn.sourceforge.net/gar/?rev=8790&view=rev
Author:   skayser
Date:     2010-02-24 15:08:58 +0000 (Wed, 24 Feb 2010)

Log Message:
-----------
gar: reduce shell callouts to uname with immediate assignments

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.conf.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-24 14:50:19 UTC (rev 8789)
+++ csw/mgar/gar/v2/gar.conf.mk	2010-02-24 15:08:58 UTC (rev 8790)
@@ -14,7 +14,7 @@
 -include /etc/opt/csw/garrc
 -include /opt/csw/etc/garrc
 
-THISHOST := $(shell uname -n)
+THISHOST := $(shell /usr/bin/uname -n)
 
 # On these platforms packages are built.
 # They will include binaries for all ISAs that are specified for the platform.
@@ -102,8 +102,8 @@
 
 # Architecture
 GARCHLIST ?= sparc i386
-GARCH    ?= $(shell uname -p)
-GAROSREL ?= $(shell uname -r)
+GARCH    := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p))
+GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r))
 
 
 # These are the standard directory name variables from all GNU

Modified: csw/mgar/gar/v2/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2010-02-24 14:50:19 UTC (rev 8789)
+++ csw/mgar/gar/v2/gar.pkg.mk	2010-02-24 15:08:58 UTC (rev 8790)
@@ -155,7 +155,7 @@
 SPKG_PSTAMP    ?= $(LOGNAME)@$(shell hostname)-$(call _REVISION)-$(shell date '+%Y%m%d%H%M%S')
 SPKG_BASEDIR   ?= $(prefix)
 SPKG_CLASSES   ?= none
-SPKG_OSNAME    ?= $(shell uname -s)$(shell uname -r)
+SPKG_OSNAME    := $(if $(SPKG_OSNAME),$(SPKG_OSNAME),$(shell /usr/bin/uname -s)$(shell /usr/bin/uname -r))
 
 SPKG_SPOOLROOT ?= $(DESTROOT)
 SPKG_SPOOLDIR  ?= $(SPKG_SPOOLROOT)/spool.$(GAROSREL)-$(GARCH)


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