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

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Fri Feb 24 14:04:51 CET 2012


Revision: 17176
          http://gar.svn.sourceforge.net/gar/?rev=17176&view=rev
Author:   dmichelsen
Date:     2012-02-24 13:04:51 +0000 (Fri, 24 Feb 2012)
Log Message:
-----------
mGAR v2-ips: Create branch, first changes

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

Added Paths:
-----------
    csw/mgar/gar/v2-ips/

Modified: csw/mgar/gar/v2-ips/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk	2012-02-11 15:58:24 UTC (rev 17020)
+++ csw/mgar/gar/v2-ips/gar.conf.mk	2012-02-24 13:04:51 UTC (rev 17176)
@@ -18,7 +18,7 @@
 
 # On these platforms packages are built.
 # They will include binaries for all ISAs that are specified for the platform.
-PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386
+PACKAGING_PLATFORMS ?= solaris9-sparc solaris9-i386 solaris11-sparc solaris11-i386
 
 # This is the platform we are currently building. It is either set when
 # invoked from "gmake platforms" or when you build a package on a host
@@ -82,6 +82,11 @@
 # Space separated list of paths to search for DISTFILES.
 GARCHIVEPATH ?= $(GARCHIVEDIR)
 
+# Architecture
+GARCHLIST ?= sparc i386
+GARCH    := $(if $(GARCH),$(GARCH),$(shell /usr/bin/uname -p))
+GAROSREL := $(if $(GAROSREL),$(GAROSREL),$(shell /usr/bin/uname -r))
+
 # Select compiler
 # GARCOMPILER can be either GNU/SUN which selects the default
 # Sun or GNU compiler, or the specific verions SOS11/SOS12/SOS12U1/SOS12U2/SOS12U3/GCC3/GCC4
@@ -91,8 +96,12 @@
 # We have parameters for the following compilers
 GARCOMPILERS = GCC3 GCC4 SOS11 SOS12 SOS12U1 SOS12U2 SOS12U3
 
+GARCOMPILER-SUN-5.9 = SOS12
+GARCOMPILER-SUN-5.10 = SOS12
+GARCOMPILER-SUN-5.11 = SOS12U2
+
 ifeq ($(GARCOMPILER),SUN)
-  GARCOMPILER = SOS12
+  GARCOMPILER = $(GARCOMPILER-SUN-$(GAROSREL))
 endif
 
 ifeq ($(GARCOMPILER),GNU)
@@ -106,12 +115,7 @@
 # Build flavor (OPT/DBG)
 GARFLAVOR ?= OPT
 
-# Architecture
-GARCHLIST ?= sparc i386
-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
 # makefiles.  They're also used by autoconf, and can be adapted
 # for a variety of build systems.
@@ -457,12 +461,16 @@
 # Raise these in your .garrc if needed
 ISA_DEFAULT_sparc-5.9    ?= sparcv8
 ISA_DEFAULT_sparc-5.10   ?= sparcv8plus
+ISA_DEFAULT_sparc-5.11   ?= sparcv8plus
 ISA_DEFAULT_i386-5.9     ?= i386
 ISA_DEFAULT_i386-5.10    ?= pentium_pro
+ISA_DEFAULT_i386-5.11    ?= pentium_pro
 ISA_DEFAULT64_sparc-5.9  ?= sparcv9
 ISA_DEFAULT64_sparc-5.10 ?= sparcv9
+ISA_DEFAULT64_sparc-5.11 ?= sparcv9
 ISA_DEFAULT64_i386-5.9   ?= amd64
 ISA_DEFAULT64_i386-5.10  ?= amd64
+ISA_DEFAULT64_i386-5.11  ?= amd64
 
 ISA_DEFAULT_sparc   ?= $(ISA_DEFAULT_sparc-$(GAROSREL))
 ISA_DEFAULT_i386    ?= $(ISA_DEFAULT_i386-$(GAROSREL))

Modified: csw/mgar/gar/v2-ips/gar.mk
===================================================================
--- csw/mgar/gar/v2/gar.mk	2012-02-11 15:58:24 UTC (rev 17020)
+++ csw/mgar/gar/v2-ips/gar.mk	2012-02-24 13:04:51 UTC (rev 17176)
@@ -234,6 +234,7 @@
 define modulationvalue
 $(strip $(or $($(1)_$(MODULATION)),\
              $($(1)_$(MODULATION_ISACOLLAPSED)),\
+             $($(1)_$(MODULATION_ISACOLLAPSEDEXTRA)),\
 ))
 endef
 

Modified: csw/mgar/gar/v2-ips/gar.pkg.mk
===================================================================
--- csw/mgar/gar/v2/gar.pkg.mk	2012-02-11 15:58:24 UTC (rev 17020)
+++ csw/mgar/gar/v2-ips/gar.pkg.mk	2012-02-24 13:04:51 UTC (rev 17176)
@@ -93,6 +93,8 @@
 _PKG_SPECS      = $(filter-out $(NOPACKAGE),$(SPKG_SPECS))
 $(if $(_PKG_SPECS),,$(error No packages for building defined))
 
+_PKG_SPECS_IPS = $(NAME)
+
 # The is the name of the package containing the sourcefiles for all packages generated from this GAR recipe.
 # It defaults to the first defined package name or gspec. SRCPACKAGE_BASE is guaranteed
 # to be one of the real packages built.
@@ -688,7 +690,23 @@
 	) >$@
 	$(if $(ALLOW_RELOCATE),echo "BASEDIR=$(RELOCATE_PREFIX)" >>$@)
 
+$(warning W: $(WORKDIR))
 
+$(WORKDIR)/%.proto: $(WORKDIR)
+	$(_DBG)(cd $(PKGROOT) && pkgsend generate .) >$@
+
+$(WORKDIR)/%.meta: $(WORKDIR)
+	$(_DBG)(echo "set name=pkg.fmri value=$*@$(VERSION)"; \
+	echo "set name=pkg.summary value=\"$(SPKG_DESC)\""; \
+	echo "set name=pkg.description value=\"$(SPKG_DESC)\""; \
+	echo "set name=variant.arch value=$(GARCH)"; \
+	echo "set name=info.classification value=org.opencsw.category.2012:$(CATEGORY)"; \
+	$(_CATEGORY_IPS_META) \
+	) >$@
+
+packageips-%: $(WORKDIR)/%.proto $(WORKDIR)/%.meta
+	cd $(WORKDIR) && pkgmogrify $*.proto $*.meta > $*.p5m
+
 # findlicensefile - Find an existing file for a given license name
 #
 define findlicensefile
@@ -873,6 +891,8 @@
 
 PACKAGE_TARGETS = $(foreach SPEC,$(_PKG_SPECS), package-$(SPEC))
 
+PACKAGE_TARGETS_IPS = $(foreach SPEC,$(_PKG_SPECS_IPS),packageips-$(SPEC))
+
 SPKG_DESTDIRS = $(SPKG_SPOOLDIR) $(SPKG_EXPORT)
 
 $(SPKG_DESTDIRS):
@@ -913,10 +933,19 @@
 			done)),)
 _buildpackage: pre-package $(PACKAGE_TARGETS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck)
 
+_buildpackage-ips: pre-package $(PACKAGE_TARGETS_IPS) post-package $(if $(filter-out 0,$(ENABLE_CHECK)),pkgcheck)
+
 _package: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage
 	@$(MAKECOOKIE)
 
-package: _package
+PKGFORMAT-5.8 = svr4
+PKGFORMAT-5.9 = svr4
+PKGFORMAT-5.10 = svr4
+PKGFORMAT-5.11 = ips
+
+package: package-$(PKGFORMAT-$(GAROSREL))
+
+package-svr4: _package
 	@echo
 	@echo "The following packages have been built:"
 	@echo
@@ -924,6 +953,9 @@
 	@echo
 	@$(DONADA)
 
+package-ips: validateplatform extract-global merge $(SPKG_DESTDIRS) _buildpackage-ips
+	@$(MAKECOOKIE)
+
 dirpackage: _DIRPACKAGE=1
 dirpackage: ENABLE_CHECK=
 dirpackage: _package

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