Revision: 12517
http://gar.svn.sourceforge.net/gar/?rev=12517&view=rev
Author: gadavis
Date: 2011-01-12 21:44:39 +0000 (Wed, 12 Jan 2011)
Log Message:
-----------
Add Fortran compatibility to GAR from the gar-fortran branch
Modified Paths:
--------------
csw/mgar/gar/v2/gar.conf.mk
Property Changed:
----------------
csw/mgar/gar/v2/
csw/mgar/gar/v2/pkglib/csw/depend
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-dirpackage:8125-8180
/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: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-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
Modified: csw/mgar/gar/v2/gar.conf.mk
===================================================================
--- csw/mgar/gar/v2/gar.conf.mk 2011-01-12 19:35:45 UTC (rev 12516)
+++ csw/mgar/gar/v2/gar.conf.mk 2011-01-12 21:44:39 UTC (rev 12517)
@@ -480,6 +480,16 @@
SOS11_CXX ?= $(SOS11_CC_HOME)/bin/CC
SOS12_CXX ?= $(SOS12_CC_HOME)/bin/CC
SOS12U1_CXX ?= $(SOS12U1_CC_HOME)/bin/CC
+ GCC3_F77 ?= $(GCC3_CC_HOME)/bin/g77
+ GCC4_F77 ?= $(GCC4_CC_HOME)/bin/gfortran
+ SOS11_F77 ?= $(SOS11_CC_HOME)/bin/f77
+ SOS12_F77 ?= $(SOS12_CC_HOME)/bin/f77
+ SOS12U1_F77 ?= $(SOS12U1_CC_HOME)/bin/f77
+ GCC3_FC ?= $(GCC3_CC_HOME)/bin/g77
+ GCC4_FC ?= $(GCC4_CC_HOME)/bin/gfortran
+ SOS11_FC ?= $(SOS11_CC_HOME)/bin/f95
+ SOS12_FC ?= $(SOS12_CC_HOME)/bin/f95
+ SOS12U1_FC ?= $(SOS12U1_CC_HOME)/bin/f95
GCC3_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC3_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
GCC4_CC_FLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
@@ -501,22 +511,43 @@
SOS11_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS11_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
-xnorunpath
SOS12_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS12_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
SOS12U1_LD_FLAGS ?= $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS12U1_LD_FLAGS) $(EXTRA_SOS_LD_FLAGS) $(EXTRA_LD_FLAGS) -norunpath
+ GCC3_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC3_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS)
+ GCC4_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC4_FFLAGS) $(EXTRA_GCC_FFLAGS) $(EXTRA_FFLAGS)
+ SOS11_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS11_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath
+ SOS12_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS12_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath
+ SOS12U1_FFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS12U1_FFLAGS) $(EXTRA_SOS_FFLAGS) $(EXTRA_FFLAGS) -norunpath
+ GCC3_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC3_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS)
+ GCC4_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_GCC4_FCFLAGS) $(EXTRA_GCC_FCFLAGS) $(EXTRA_FCFLAGS)
+ SOS11_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS11_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath
+ SOS12_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS12_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath
+ SOS12U1_FCFLAGS ?= $(FLAVOR_FLAGS) $(ARCHFLAGS_$(GARCOMPILER)_$(ISA))
$(EXTRA_SOS12U1_FCFLAGS) $(EXTRA_SOS_FCFLAGS) $(EXTRA_FCFLAGS) -norunpath
# Compiler version
GCC3_CC_VERSION = $(shell $(GCC3_CC) -v 2>&1| ggrep version)
GCC3_CXX_VERSION = $(shell $(GCC3_CXX) -v 2>&1| ggrep version)
+ GCC3_F77_VERSION = $(shell $(GCC3_F77) -v 2>&1| ggrep version)
GCC4_CC_VERSION = $(shell $(GCC4_CC) -v 2>&1| ggrep version)
GCC4_CXX_VERSION = $(shell $(GCC4_CXX) -v 2>&1| ggrep version)
+ GCC4_F77_VERSION = $(shell $(GCC4_F77) -v 2>&1| ggrep version)
+ GCC4_FC_VERSION = $(shell $(GCC4_FC) -v 2>&1| ggrep version)
SOS11_CC_VERSION = $(shell $(SOS11_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc:
//')
SOS11_CXX_VERSION = $(shell $(SOS11_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC:
//')
+ SOS11_F77_VERSION = $(shell $(SOS11_F77) -V 2>&1| ggrep f90: | gsed -e
's/f90: //')
+ SOS11_FC_VERSION = $(shell $(SOS11_FC) -V 2>&1| ggrep f90: | gsed -e
's/f90: //')
SOS12_CC_VERSION = $(shell $(SOS12_CC) -V 2>&1| ggrep cc: | gsed -e 's/cc:
//')
+ SOS12_F77_VERSION = $(shell $(SOS12_F77) -V 2>&1| ggrep -e 'f9[05]': | gsed
-e 's/f9[05]: //')
+ SOS12_FC_VERSION = $(shell $(SOS12_FC) -V 2>&1| ggrep -e 'f9[05]:' | gsed
-e 's/f9[05]: //')
SOS12_CXX_VERSION = $(shell $(SOS12_CXX) -V 2>&1| ggrep CC: | gsed -e 's/CC:
//')
SOS12U1_CC_VERSION = $(shell $(SOS12U1_CC) -V 2>&1| ggrep cc: | gsed -e
's/cc: //')
SOS12U1_CXX_VERSION = $(shell $(SOS12U1_CXX) -V 2>&1| ggrep CC: | gsed -e
's/CC: //')
+SOS12U1_F77_VERSION = $(shell $(SOS12U1_F77) -V 2>&1| ggrep -e 'f9[05]': |
gsed -e 's/f9[05]: //')
+ SOS12U1_FC_VERSION = $(shell $(SOS12U1_FC) -V 2>&1| ggrep -e 'f9[05]:' | gsed
-e 's/f9[05]: //')
CC_VERSION = $($(GARCOMPILER)_CC_VERSION)
CXX_VERSION = $($(GARCOMPILER)_CXX_VERSION)
+F77_VERSION = $($(GARCOMPILER)_F77_VERSION)
+ FC_VERSION = $($(GARCOMPILER)_FC_VERSION)
#
# Construct compiler options
@@ -563,12 +594,17 @@
CC_HOME = $($(GARCOMPILER)_CC_HOME)
CC = $($(GARCOMPILER)_CC)
CXX = $($(GARCOMPILER)_CXX)
+F77 = $($(GARCOMPILER)_F77)
+FC = $($(GARCOMPILER)_FC)
+
CFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_CFLAGS)
$(EXTRA_CFLAGS))
CXXFLAGS ?= $(strip $($(GARCOMPILER)_CXX_FLAGS) $(_CATEGORY_CXXFLAGS)
$(EXTRA_CXXFLAGS))
CPPFLAGS ?= $(strip $($(GARCOMPILER)_CPP_FLAGS) $(_CATEGORY_CPPFLAGS)
$(EXTRA_CPPFLAGS) $(INCLUDE_FLAGS))
LDFLAGS ?= $(strip $($(GARCOMPILER)_LD_FLAGS) $(_CATEGORY_LDFLAGS)
$(EXTRA_LDFLAGS) $(LINKER_FLAGS))
ASFLAGS ?= $(strip $($(GARCOMPILER)_AS_FLAGS) $(_CATEGORY_ASFLAGS)
$(EXTRA_ASFLAGS))
OPTFLAGS ?= $(strip $($(GARCOMPILER)_CC_FLAGS) $(_CATEGORY_OPTFLAGS)
$(EXTRA_OPTFLAGS))
+FFLAGS ?= $(strip $($(GARCOMPILER)_FFLAGS) $(_CATEGORY_FFLAGS)
$(EXTRA_FFLAGS))
+FCFLAGS ?= $(strip $($(GARCOMPILER)_FCFLAGS) $(_CATEGORY_FCFLAGS)
$(EXTRA_FCFLAGS))
GCC3_LD_OPTIONS = -R$(GCC3_CC_HOME)/lib $(EXTRA_GCC3_LD_OPTIONS)
$(EXTRA_GCC_LD_OPTIONS)
GCC4_LD_OPTIONS = -R$(abspath $(GCC4_CC_HOME)/lib/$(MM_LIBDIR))
$(EXTRA_GCC4_LD_OPTIONS) $(EXTRA_GCC_LD_OPTIONS)
@@ -652,6 +688,7 @@
ifeq ($(origin COMPILER_EXPORTS), undefined)
COMPILER_EXPORTS = CPPFLAGS CFLAGS CXXFLAGS LDFLAGS
+COMPILER_EXPORTS += FFLAGS FCFLAGS
COMPILER_EXPORTS += ASFLAGS OPTFLAGS CC CXX
COMPILER_EXPORTS += CC_HOME CC_VERSION CXX_VERSION
endif
@@ -705,6 +742,8 @@
@echo
@echo " C Compiler: $(CC)"
@echo " C++ Compiler: $(CXX)"
+ @echo " F77 Compiler: $(F77)"
+ @echo " FC Compiler: $(FC)"
@echo
@echo "Compiler ISA generation matrix:"
@echo
@@ -753,6 +792,8 @@
echo " CFLAGS = $(CFLAGS)"; \
echo " CXXFLAGS = $(CXXFLAGS)"; \
echo " CPPFLAGS = $(CPPFLAGS)"; \
+ echo " FFLAGS = $(FFLAGS)"; \
+ echo " FCFLAGS = $(FCFLAGS)"; \
echo " LDFLAGS = $(LDFLAGS)"; \
echo " LD_OPTIONS = $(LD_OPTIONS)"; \
echo " ASFLAGS = $(ASFLAGS)"; \
Property changes on: csw/mgar/gar/v2/pkglib/csw/depend
___________________________________________________________________
Modified: svn:mergeinfo
- /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678
/csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011
/csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend:10585-10737
/csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649
/csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895
/csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180
/csw/mgar/gar/v2-noexternals/pkglib/csw/depend:11592-11745
/csw/mgar/gar/v2-relocate/pkglib/csw/depend:5028-11738
/csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132
/csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449
+ /csw/mgar/gar/v2/pkglib/csw/depend:4936-6678
/csw/mgar/gar/v2-bwalton/pkglib/csw/depend:9784-10011
/csw/mgar/gar/v2-checkpkg/pkglib/csw/depend:7722-7855
/csw/mgar/gar/v2-checkpkg-override-relocation/pkglib/csw/depend:10585-10737
/csw/mgar/gar/v2-checkpkg-stats/pkglib/csw/depend:8454-8649
/csw/mgar/gar/v2-collapsed-modulations/pkglib/csw/depend:6895
/csw/mgar/gar/v2-dirpackage/pkglib/csw/depend:8125-8180
/csw/mgar/gar/v2-fortran/pkglib/csw/depend:10883-12516
/csw/mgar/gar/v2-noexternals/pkglib/csw/depend:11592-11745
/csw/mgar/gar/v2-relocate/pkglib/csw/depend:5028-11738
/csw/mgar/gar/v2-skayser/pkglib/csw/depend:6087-6132
/csw/mgar/gar/v2-sqlite/pkglib/csw/depend:10434-10449
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
