[csw-devel] SF.net SVN: gar:[15950] csw/mgar/gar/v2
wahwah at users.sourceforge.net
wahwah at users.sourceforge.net
Fri Oct 21 10:13:14 CEST 2011
Revision: 15950
http://gar.svn.sourceforge.net/gar/?rev=15950&view=rev
Author: wahwah
Date: 2011-10-21 08:13:14 +0000 (Fri, 21 Oct 2011)
Log Message:
-----------
mGAR v2: Raising default ISAs for Solaris 10, merging in the v2-raised-buildlevel branch
Modified Paths:
--------------
csw/mgar/gar/v2/gar.conf.mk
Property Changed:
----------------
csw/mgar/gar/v2/
Property changes on: csw/mgar/gar/v2
___________________________________________________________________
Modified: svn:mergeinfo
- /csw/mgar/gar/v2:4936-6678
/csw/mgar/gar/v2-bwalton:9784-10011
/csw/mgar/gar/v2-checkpkg:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737
/csw/mgar/gar/v2-checkpkg-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-defaultchange:13903-14022
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-fortran:10883-12516
/csw/mgar/gar/v2-git/v2-relocate:7617
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-noexternals:11592-11745
/csw/mgar/gar/v2-relocate:5028-11738
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-sqlite:10434-10449
/csw/mgar/gar/v2-uwatch2:12141-13270
+ /csw/mgar/gar/v2:4936-6678
/csw/mgar/gar/v2-bwalton:9784-10011
/csw/mgar/gar/v2-checkpkg:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation:10585-10737
/csw/mgar/gar/v2-checkpkg-stats:8454-8649
/csw/mgar/gar/v2-collapsed-modulations:6895
/csw/mgar/gar/v2-defaultchange:13903-14022
/csw/mgar/gar/v2-dirpackage:8125-8180
/csw/mgar/gar/v2-fortran:10883-12516
/csw/mgar/gar/v2-git/v2-relocate:7617
/csw/mgar/gar/v2-migrateconf:7082-7211
/csw/mgar/gar/v2-noexternals:11592-11745
/csw/mgar/gar/v2-raised-buildlevel:15906-15949
/csw/mgar/gar/v2-relocate:5028-11738
/csw/mgar/gar/v2-skayser:6087-6132
/csw/mgar/gar/v2-sqlite:10434-10449
/csw/mgar/gar/v2-uwatch2:12141-13270
Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk 2011-10-21 08:08:51 UTC (rev 15949)
+++ csw/mgar/gar/v2/gar.conf.mk 2011-10-21 08:13:14 UTC (rev 15950)
@@ -411,11 +411,20 @@
FLAVOR_FLAGS += $(EXTRA_$(GARFLAVOR)_FLAGS_$(GARCOMPILER)_$(GARCH)) $(EXTRA_$(GARFLAVOR)_FLAGS_$(GARCOMPILER))
# Raise these in your .garrc if needed
-ISA_DEFAULT_sparc ?= sparcv8
-ISA_DEFAULT_i386 ?= i386
-ISA_DEFAULT64_sparc ?= sparcv9
-ISA_DEFAULT64_i386 ?= amd64
+ISA_DEFAULT_sparc-5.9 ?= sparcv8
+ISA_DEFAULT_sparc-5.10 ?= sparcv8plus
+ISA_DEFAULT_i386-5.9 ?= i386
+ISA_DEFAULT_i386-5.10 ?= pentium_pro
+ISA_DEFAULT64_sparc-5.9 ?= sparcv9
+ISA_DEFAULT64_sparc-5.10 ?= sparcv9
+ISA_DEFAULT64_i386-5.9 ?= amd64
+ISA_DEFAULT64_i386-5.10 ?= amd64
+ISA_DEFAULT_sparc ?= $(ISA_DEFAULT_sparc-$(GAROSREL))
+ISA_DEFAULT_i386 ?= $(ISA_DEFAULT_i386-$(GAROSREL))
+ISA_DEFAULT64_sparc ?= $(ISA_DEFAULT64_sparc-$(GAROSREL))
+ISA_DEFAULT64_i386 ?= $(ISA_DEFAULT64_i386-$(GAROSREL))
+
# These are the ISAs that are always build for 32 bit and 64 bit
# Do not overwrite these as they are used to control expansion at several other places
ISA_DEFAULT = $(ISA_DEFAULT_$(GARCH))
@@ -450,8 +459,8 @@
# Subdirectories for specialized binaries and libraries
# Use defaults for sparcv8 and i386 as those are symlinks
-ISALIBDIR_sparcv8 ?= .
-ISALIBDIR_i386 ?= .
+ISALIBDIR_$(ISA_DEFAULT_sparc) ?= .
+ISALIBDIR_$(ISA_DEFAULT_i386) ?= .
$(foreach I,$(ISALIST),$(eval ISALIBDIR_$(I) ?= $I))
# These are the directories where the optimized libraries should go to
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