Patch: Change Conf Files to Support Tau
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Patch: Change Conf Files to Support Tau
- To: pooma-dev@xxxxxxxxxxxxxxxxxxxxxx
- Subject: Patch: Change Conf Files to Support Tau
- From: Jeffrey Oldham <oldham@xxxxxxxxxxxxxxxx>
- Date: Fri, 5 Oct 2001 17:19:46 -0700
2001-10-05 Jeffrey D. Oldham <oldham@xxxxxxxxxxxxxxxx>
All these changes were motivated by TAU's use of 'i386_linux'
rather than 'linux'. Thus a new variable '$profile_archtype' is
introduced. Furthermore, for most configuration files, this
equals '$archtype' so the latter variable definition is moved up in the
file and all occurrences of its value are replaced by '$archtype'.
* configure: For TAUINSTR and TAUPARSE, use '$profile_archtype'.
* config/arch/LINUXEGCS.conf: See the description above.
* config/arch/LINUXKCC.conf: Likewise.
* config/arch/LINUXgcc.conf: Likewise.
* config/arch/SGI64CC.conf: Likewise.
* config/arch/SGI64EGCS.conf: Likewise.
* config/arch/SGI64KCC.conf: Likewise.
* config/arch/SGI64gcc.conf: Likewise.
* config/arch/SGIN32CC.conf: Likewise.
* config/arch/SGIN32EGCS.conf: Likewise.
* config/arch/SGIN32KCC.conf: Likewise.
* config/arch/SGIN32gcc.conf: Likewise.
* config/arch/SUNKCC.conf: Likewise.
Testing: only LINUXgcc.conf tested by its use to compile Pooma library and several executables
Applied to mainline
Approved by Stephen Smith
Thanks,
Jeffrey D. Oldham
oldham@xxxxxxxxxxxxxxxx
Index: configure
===================================================================
RCS file: /home/pooma/Repository/r2/configure,v
retrieving revision 1.104
diff -c -p -r1.104 configure
*** configure 2001/08/06 16:20:33 1.104
--- configure 2001/10/05 21:02:57
*************** sub writesuitefile
*** 1928,1935 ****
print FSUITE "include $profile_dir/$profile_lib_subdir/$profile_include_makefile\n";
print FSUITE "TAUPROFILE = 1\n";
print FSUITE "PDTDIR = $pdt_dir\n";
! print FSUITE "TAUINSTR = \$(TAUDIR)/$archtype/bin/tau_instrumentor\n";
! print FSUITE "TAUPARSE = \$(PDTDIR)/$archtype/bin/cxxparse\n";
print FSUITE "\n";
}
--- 1928,1935 ----
print FSUITE "include $profile_dir/$profile_lib_subdir/$profile_include_makefile\n";
print FSUITE "TAUPROFILE = 1\n";
print FSUITE "PDTDIR = $pdt_dir\n";
! print FSUITE "TAUINSTR = \$(TAUDIR)/$profile_archtype/bin/tau_instrumentor\n";
! print FSUITE "TAUPARSE = \$(PDTDIR)/$profile_archtype/bin/cxxparse\n";
print FSUITE "\n";
}
Index: config/arch/LINUXEGCS.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/LINUXEGCS.conf,v
retrieving revision 1.24
diff -c -p -r1.24 LINUXEGCS.conf
*** config/arch/LINUXEGCS.conf 2001/08/06 16:23:28 1.24
--- config/arch/LINUXEGCS.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "linux";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "linux/lib";
$threads_basic_makefile = "Makefile.smarts-g++";
$threads_profile_makefile = "Makefile.smarts-tau-g++";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-g++";
$threads_profile_makefile = "Makefile.smarts-tau-g++";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "linux/lib";
$profile_basic_makefile = "Makefile.tau-egcs";
$profile_smarts_makefile = "Makefile.tau-smarts-egcs";
$profile_pthreads_makefile = "Makefile.tau-pthread-egcs";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "i386_linux";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-egcs";
$profile_smarts_makefile = "Makefile.tau-smarts-egcs";
$profile_pthreads_makefile = "Makefile.tau-pthread-egcs";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "linux/lib";
$paws_makefile = "Makefile.paws-egcs";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-egcs";
*************** $hdf5_default_dir = "/usr/local
*** 91,104 ****
### location of FFTW files for ffts
$fftw_able = 1;
! $fftw_default_dir = "/home/pooma/packages/fftw/linux";
### location of cheetah
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "linux";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
--- 98,111 ----
### location of FFTW files for ffts
$fftw_able = 1;
! $fftw_default_dir = "/home/pooma/packages/fftw/$archtype";
### location of cheetah
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $ld_insure_arg = "-Zvm -Zoi \"compiler
*** 136,144 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "linux";
$comptype = "egcs";
$compext = "-egcs";
--- 143,148 ----
Index: config/arch/LINUXKCC.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/LINUXKCC.conf,v
retrieving revision 1.34
diff -c -p -r1.34 LINUXKCC.conf
*** config/arch/LINUXKCC.conf 2001/08/06 16:23:28 1.34
--- config/arch/LINUXKCC.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "linux";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "linux/lib";
$threads_basic_makefile = "Makefile.smarts-kcc";
$threads_profile_makefile = "Makefile.smarts-tau-kcc";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-kcc";
$threads_profile_makefile = "Makefile.smarts-tau-kcc";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "linux/lib";
$profile_basic_makefile = "Makefile.tau-kcc";
$profile_smarts_makefile = "Makefile.tau-smarts-kcc";
$profile_pthreads_makefile = "Makefile.tau-pthread-kcc";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "i386_linux";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-kcc";
$profile_smarts_makefile = "Makefile.tau-smarts-kcc";
$profile_pthreads_makefile = "Makefile.tau-pthread-kcc";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "linux/lib";
$paws_makefile = "Makefile.paws-kcc";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-kcc";
*************** $hdf5_default_dir = "/usr/local
*** 91,104 ****
### location of FFTW files for ffts
$fftw_able = 1;
! $fftw_default_dir = "/home/pooma/packages/fftw/linux";
### location of cheetah
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "linux";
$cheetah_lib_subdir = "lib/KCC";
$cheetah_include_makefile = "Makefile.cheetah";
--- 98,111 ----
### location of FFTW files for ffts
$fftw_able = 1;
! $fftw_default_dir = "/home/pooma/packages/fftw/$archtype";
### location of cheetah
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/KCC";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $insure_able = 0;
*** 126,134 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "linux";
$comptype = "kcc";
$compext = "-kcc";
--- 133,138 ----
Index: config/arch/LINUXgcc.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/LINUXgcc.conf,v
retrieving revision 1.2
diff -c -p -r1.2 LINUXgcc.conf
*** config/arch/LINUXgcc.conf 2001/08/06 16:23:28 1.2
--- config/arch/LINUXgcc.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "linux";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "linux/lib";
$threads_basic_makefile = "Makefile.smarts-g++";
$threads_profile_makefile = "Makefile.smarts-tau-g++";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-g++";
$threads_profile_makefile = "Makefile.smarts-tau-g++";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "linux/lib";
$profile_basic_makefile = "Makefile.tau-gcc";
$profile_smarts_makefile = "Makefile.tau-smarts-gcc";
$profile_pthreads_makefile = "Makefile.tau-pthread-gcc";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "i386_linux";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-gcc";
$profile_smarts_makefile = "Makefile.tau-smarts-gcc";
$profile_pthreads_makefile = "Makefile.tau-pthread-gcc";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "linux/lib";
$paws_makefile = "Makefile.paws-gcc";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-gcc";
*************** $hdf5_default_dir = "/usr/local
*** 91,104 ****
### location of FFTW files for ffts
$fftw_able = 1;
! $fftw_default_dir = "/home/pooma/packages/fftw/linux";
### location of cheetah
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "linux";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
--- 98,111 ----
### location of FFTW files for ffts
$fftw_able = 1;
! $fftw_default_dir = "/home/pooma/packages/fftw/$archtype";
### location of cheetah
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $ld_insure_arg = "-Zvm -Zoi \"compiler
*** 136,144 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "linux";
$comptype = "gcc";
$compext = "-gcc";
--- 143,148 ----
Index: config/arch/SGI64CC.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SGI64CC.conf,v
retrieving revision 1.41
diff -c -p -r1.41 SGI64CC.conf
*** config/arch/SGI64CC.conf 2001/08/06 16:23:28 1.41
--- config/arch/SGI64CC.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sgi64";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sgi64/lib";
$threads_basic_makefile = "Makefile.smarts-CC";
$threads_profile_makefile = "Makefile.smarts-tau";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-CC";
$threads_profile_makefile = "Makefile.smarts-tau";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sgi64/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "sgi64/lib";
$paws_makefile = "Makefile.paws";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws";
*************** $hdf5_default_dir = "/usr/local
*** 92,98 ****
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "sgi64";
$cheetah_lib_subdir = "lib/CC";
$cheetah_include_makefile = "Makefile.cheetah";
--- 99,105 ----
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/CC";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $sgibits = "-64 -mips4";
*** 133,141 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sgi64";
$comptype = "CC";
### are shared libraries supported?
--- 140,145 ----
Index: config/arch/SGI64EGCS.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SGI64EGCS.conf,v
retrieving revision 1.39
diff -c -p -r1.39 SGI64EGCS.conf
*** config/arch/SGI64EGCS.conf 2001/08/06 16:23:28 1.39
--- config/arch/SGI64EGCS.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sgi64";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sgi64/lib";
$threads_basic_makefile = "Makefile.smarts-g++";
$threads_profile_makefile = "Makefile.smarts-tau-g++";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-g++";
$threads_profile_makefile = "Makefile.smarts-tau-g++";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sgi64/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-egcs";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-egcs";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-egcs";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-egcs";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-egcs";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-egcs";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "sgi64/lib";
$paws_makefile = "Makefile.paws-egcs";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-egcs";
*************** $hdf5_default_dir = "/usr/local
*** 92,98 ****
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "sgi64";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
--- 99,105 ----
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $sgibits = "-mabi=64 -mips4";
*** 133,141 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sgi64";
$comptype = "egcs";
$compext = "-egcs";
--- 140,145 ----
Index: config/arch/SGI64KCC.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SGI64KCC.conf,v
retrieving revision 1.52
diff -c -p -r1.52 SGI64KCC.conf
*** config/arch/SGI64KCC.conf 2001/08/06 16:23:28 1.52
--- config/arch/SGI64KCC.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sgi64";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sgi64/lib";
$threads_basic_makefile = "Makefile.smarts-kcc";
$threads_profile_makefile = "Makefile.smarts-tau-kcc";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-kcc";
$threads_profile_makefile = "Makefile.smarts-tau-kcc";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sgi64/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-kcc";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-kcc";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-kcc";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-kcc";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-kcc";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-kcc";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "sgi64/lib";
$paws_makefile = "Makefile.paws-kcc";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-kcc";
*************** $hdf5_default_dir = "/usr/local
*** 91,104 ****
### location of FFTW files for ffts
$fftw_able = 1;
! $fftw_default_dir = "/usr/local/pooma/packages/fftw/sgi64";
### location of cheetah
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "sgi64";
$cheetah_lib_subdir = "lib/KCC";
$cheetah_include_makefile = "Makefile.cheetah";
--- 98,111 ----
### location of FFTW files for ffts
$fftw_able = 1;
! $fftw_default_dir = "/usr/local/pooma/packages/fftw/$archtype";
### location of cheetah
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/KCC";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $sgibits = "-64 -mips4";
*** 129,137 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sgi64";
$comptype = "kcc";
$compext = "-kcc";
--- 136,141 ----
Index: config/arch/SGI64gcc.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SGI64gcc.conf,v
retrieving revision 1.2
diff -c -p -r1.2 SGI64gcc.conf
*** config/arch/SGI64gcc.conf 2001/08/06 16:23:28 1.2
--- config/arch/SGI64gcc.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sgi64";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sgi64/lib";
$threads_basic_makefile = "Makefile.smarts-g++";
$threads_profile_makefile = "Makefile.smarts-tau-g++";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-g++";
$threads_profile_makefile = "Makefile.smarts-tau-g++";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sgi64/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-gcc";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-gcc";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-gcc";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-gcc";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-gcc";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-gcc";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "sgi64/lib";
$paws_makefile = "Makefile.paws-gcc";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-gcc";
*************** $hdf5_default_dir = "/usr/local
*** 92,98 ****
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "sgi64";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
--- 99,105 ----
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $sgibits = "-mabi=64 -mips4";
*** 133,141 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sgi64";
$comptype = "gcc";
$compext = "-gcc";
--- 140,145 ----
Index: config/arch/SGIN32CC.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SGIN32CC.conf,v
retrieving revision 1.43
diff -c -p -r1.43 SGIN32CC.conf
*** config/arch/SGIN32CC.conf 2001/08/06 16:23:28 1.43
--- config/arch/SGIN32CC.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sgin32";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sgin32/lib";
$threads_basic_makefile = "Makefile.smarts-CC";
$threads_profile_makefile = "Makefile.smarts-tau-CC";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-CC";
$threads_profile_makefile = "Makefile.smarts-tau-CC";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sgin32/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "sgin32/lib";
$paws_makefile = "Makefile.paws";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws";
*************** $hdf5_default_dir = "/usr/local
*** 92,98 ****
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "sgin32";
$cheetah_lib_subdir = "lib/CC";
$cheetah_include_makefile = "Makefile.cheetah";
--- 99,105 ----
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/CC";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $cheetah_include_makefile = "Makefile.c
*** 101,107 ****
$lux_able = 1;
$lux_default_dir = "/usr/local/pooma/packages/lux/aclvis-2.0";
! $lux_lib_subdir = "sgin32/lib";
$lux_makefile = "Makefile.aclvis";
--- 108,114 ----
$lux_able = 1;
$lux_default_dir = "/usr/local/pooma/packages/lux/aclvis-2.0";
! $lux_lib_subdir = "$archtype/lib";
$lux_makefile = "Makefile.aclvis";
*************** $sgibits = "-n32 -mips4";
*** 137,145 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sgin32";
$comptype = "CC";
### are shared libraries supported?
--- 144,149 ----
Index: config/arch/SGIN32EGCS.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SGIN32EGCS.conf,v
retrieving revision 1.34
diff -c -p -r1.34 SGIN32EGCS.conf
*** config/arch/SGIN32EGCS.conf 2001/08/06 16:23:28 1.34
--- config/arch/SGIN32EGCS.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sgin32";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sgin32/lib";
$threads_basic_makefile = "Makefile.smarts-egcs";
$threads_profile_makefile = "Makefile.smarts-tau-egcs";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-egcs";
$threads_profile_makefile = "Makefile.smarts-tau-egcs";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sgin32/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-egcs";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-egcs";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-egcs";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-egcs";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-egcs";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-egcs";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "sgin32/lib";
$paws_makefile = "Makefile.paws-egcs";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-egcs";
*************** $hdf5_default_dir = "/usr/local
*** 92,98 ****
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "sgin32";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
--- 99,105 ----
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $sgibits = "-mabi=n32 -mips4";
*** 133,141 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sgin32";
$comptype = "egcs";
$compext = "-egcs";
--- 140,145 ----
Index: config/arch/SGIN32KCC.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SGIN32KCC.conf,v
retrieving revision 1.43
diff -c -p -r1.43 SGIN32KCC.conf
*** config/arch/SGIN32KCC.conf 2001/08/06 16:23:28 1.43
--- config/arch/SGIN32KCC.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sgin32";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sgin32/lib";
$threads_basic_makefile = "Makefile.smarts-kcc";
$threads_profile_makefile = "Makefile.smarts-tau-kcc";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-kcc";
$threads_profile_makefile = "Makefile.smarts-tau-kcc";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sgin32/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-kcc";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-kcc";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-kcc";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-kcc";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-kcc";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-kcc";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "sgin32/lib";
$paws_makefile = "Makefile.paws-kcc";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-kcc";
*************** $hdf5_default_dir = "/usr/local
*** 92,98 ****
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "sgin32";
$cheetah_lib_subdir = "lib/KCC";
$cheetah_include_makefile = "Makefile.cheetah";
--- 99,105 ----
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/KCC";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $sgibits = "-n32 -mips4";
*** 124,132 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sgin32";
$comptype = "kcc";
$compext = "-kcc";
--- 131,136 ----
Index: config/arch/SGIN32gcc.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SGIN32gcc.conf,v
retrieving revision 1.2
diff -c -p -r1.2 SGIN32gcc.conf
*** config/arch/SGIN32gcc.conf 2001/08/06 16:23:28 1.2
--- config/arch/SGIN32gcc.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sgin32";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sgin32/lib";
$threads_basic_makefile = "Makefile.smarts-gcc";
$threads_profile_makefile = "Makefile.smarts-tau-gcc";
--- 64,70 ----
$threads_able = 1;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-gcc";
$threads_profile_makefile = "Makefile.smarts-tau-gcc";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sgin32/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-gcc";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-gcc";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-gcc";
--- 74,81 ----
$profile_able = 1;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-sgitimers-gcc";
$profile_smarts_makefile = "Makefile.tau-sgitimers-smarts-gcc";
$profile_pthreads_makefile = "Makefile.tau-sgitimers-pthread-gcc";
*************** $profile_pthreads_makefile = "Makefile.t
*** 78,84 ****
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "sgin32/lib";
$paws_makefile = "Makefile.paws-gcc";
--- 85,91 ----
$paws_able = 1;
$paws_default_dir = "/home/paws/build/paws-current";
! $paws_lib_subdir = "$archtype/lib";
$paws_makefile = "Makefile.paws-gcc";
*************** $hdf5_default_dir = "/usr/local
*** 92,98 ****
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "sgin32";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
--- 99,105 ----
$cheetah_able = 1;
$cheetah_default_dir = "/home/cheetah/build/cheetah-1.0.0";
! $cheetah_arch = "$archtype";
$cheetah_lib_subdir = "lib/g++";
$cheetah_include_makefile = "Makefile.cheetah";
*************** $sgibits = "-mabi=n32 -mips4";
*** 133,141 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sgin32";
$comptype = "gcc";
$compext = "-gcc";
--- 140,145 ----
Index: config/arch/SUNKCC.conf
===================================================================
RCS file: /home/pooma/Repository/r2/config/arch/SUNKCC.conf,v
retrieving revision 1.7
diff -c -p -r1.7 SUNKCC.conf
*** config/arch/SUNKCC.conf 2000/05/05 07:44:37 1.7
--- config/arch/SUNKCC.conf 2001/10/05 21:02:57
***************
*** 47,52 ****
--- 47,58 ----
###########################################################################
###########################################################################
+ # Section 0: architecture type
+ ###########################################################################
+
+ $archtype = "sun";
+
+ ###########################################################################
# Section 1: external package locations.
# Include search directories should have a '-I' prepended.
# Library search directories should have a '-L' prepended.
***************
*** 58,64 ****
$threads_able = 0;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "sun/lib";
$threads_basic_makefile = "Makefile.smarts-kcc";
$threads_profile_makefile = "Makefile.smarts-tau-kcc";
--- 64,70 ----
$threads_able = 0;
$threads_default_dir = "/home/smarts/build/smarts-current";
! $threads_lib_subdir = "$archtype/lib";
$threads_basic_makefile = "Makefile.smarts-kcc";
$threads_profile_makefile = "Makefile.smarts-tau-kcc";
*************** $threads_profile_makefile = "Makefile.sm
*** 68,74 ****
$profile_able = 0;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_lib_subdir = "sun/lib";
$profile_basic_makefile = "Makefile.tau-kcc";
$profile_smarts_makefile = "Makefile.tau-smarts-kcc";
$profile_pthreads_makefile = "Makefile.tau-pthread-kcc";
--- 74,81 ----
$profile_able = 0;
$profile_default_dir = "/home/tau/build/tau-current";
$ductape_default_dir = "/usr/local/pooma/packages/ductape";
! $profile_archtype = "$archtype";
! $profile_lib_subdir = "$profile_archtype/lib";
$profile_basic_makefile = "Makefile.tau-kcc";
$profile_smarts_makefile = "Makefile.tau-smarts-kcc";
$profile_pthreads_makefile = "Makefile.tau-pthread-kcc";
*************** $insure_able = 0;
*** 117,125 ****
### characteristics
###################
- ### the name of this architecture
-
- $archtype = "sun";
$comptype = "kcc";
$compext = "-kcc";
--- 124,129 ----