|
Lines 70-76
Link Here
|
| 70 |
#------------------------------------------- |
70 |
#------------------------------------------- |
| 71 |
# |
71 |
# |
| 72 |
# Help variables. |
72 |
# Help variables. |
| 73 |
my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, |
73 |
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, |
| 74 |
$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, |
74 |
$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE, |
| 75 |
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC, |
75 |
$SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC, |
| 76 |
$CYGWIN, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, |
76 |
$CYGWIN, $language, $dict, $ASM_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB, |
|
Lines 339-344
Link Here
|
| 339 |
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; |
339 |
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client"; |
| 340 |
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; |
340 |
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads"; |
| 341 |
} |
341 |
} |
|
|
342 |
elsif ($machine_type eq "x86_64") |
| 343 |
{ print "Setting Linux x86-64 specific values... "; |
| 344 |
$outfile = "LinuxAMDEnv.Set"; |
| 345 |
$CPU = "X"; |
| 346 |
$CPUNAME = "X86_64"; |
| 347 |
$DLLSUFFIX = "lx"; |
| 348 |
$OUTPATH = "unxlngx4"; |
| 349 |
$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64"; |
| 350 |
$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64".$ds."client"; |
| 351 |
$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64".$ds."native_threads"; |
| 352 |
} |
| 342 |
elsif (($machine_type eq "sparc") or ($machine_type eq "sparc64")) |
353 |
elsif (($machine_type eq "sparc") or ($machine_type eq "sparc64")) |
| 343 |
|
354 |
|
| 344 |
{ print "Setting Linux Sparc specific values... "; |
355 |
{ print "Setting Linux Sparc specific values... "; |
|
Lines 682-687
Link Here
|
| 682 |
$ETC = $ds."etc"; |
693 |
$ETC = $ds."etc"; |
| 683 |
$BIN = $ds."bin"; |
694 |
$BIN = $ds."bin"; |
| 684 |
$LIB = $ds."lib"; |
695 |
$LIB = $ds."lib"; |
|
|
696 |
$LIB64 = $ds."lib"; |
| 697 |
$LIB64 .= "64" |
| 698 |
if ($platform eq "Linux" && $machine_type eq "x86_64"); |
| 685 |
$INC = $ds."inc"; |
699 |
$INC = $ds."inc"; |
| 686 |
$INCLUDE = $ds."include"; |
700 |
$INCLUDE = $ds."include"; |
| 687 |
$DEV = $ds."dev"; |
701 |
$DEV = $ds."dev"; |
|
Lines 691-697
Link Here
|
| 691 |
$SOLVER = $ds."solver"; |
705 |
$SOLVER = $ds."solver"; |
| 692 |
$CONFIG = $ds."config"; |
706 |
$CONFIG = $ds."config"; |
| 693 |
$USR_BIN = $USR.$BIN; |
707 |
$USR_BIN = $USR.$BIN; |
| 694 |
$USR_LIB = $USR.$LIB; |
708 |
$USR_LIB = $USR.$LIB64; |
| 695 |
$USR_LOCAL = $USR.$ds."local"; |
709 |
$USR_LOCAL = $USR.$ds."local"; |
| 696 |
$USR_CCS = $USR.$ds."ccs"; |
710 |
$USR_CCS = $USR.$ds."ccs"; |
| 697 |
$USR_OPENWIN = $USR.$ds."openwin"; |
711 |
$USR_OPENWIN = $USR.$ds."openwin"; |
|
Lines 716-723
Link Here
|
| 716 |
} |
730 |
} |
| 717 |
|
731 |
|
| 718 |
if ($STLPORT4 ne $no_stl) { |
732 |
if ($STLPORT4 ne $no_stl) { |
| 719 |
$ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB; |
733 |
$ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64; |
| 720 |
$L_STLPORT_LIB = $L.'$STLPORT4'.$LIB; |
734 |
$L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64; |
| 721 |
$STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport'; |
735 |
$STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport'; |
| 722 |
$STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport'; |
736 |
$STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport'; |
| 723 |
} else { |
737 |
} else { |
|
Lines 852-858
Link Here
|
| 852 |
$ps.$JRELIBDIR. |
866 |
$ps.$JRELIBDIR. |
| 853 |
$ps.$JRETOOLKITDIR. |
867 |
$ps.$JRETOOLKITDIR. |
| 854 |
$ps.$JRETHREADDIR. |
868 |
$ps.$JRETHREADDIR. |
| 855 |
$ps.$par_dir.$LIB. |
869 |
$ps.$par_dir.$LIB64. |
| 856 |
$ps_STLPORT_LIB. |
870 |
$ps_STLPORT_LIB. |
| 857 |
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. |
871 |
$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB. |
| 858 |
$ps.$ENV{'LD_LIBRARY_PATH'}; |
872 |
$ps.$ENV{'LD_LIBRARY_PATH'}; |
|
Lines 936-942
Link Here
|
| 936 |
($platform eq "$Irix64") || ($platform eq "$FreeBSD") || |
950 |
($platform eq "$Irix64") || ($platform eq "$FreeBSD") || |
| 937 |
($platform eq "AIX")) |
951 |
($platform eq "AIX")) |
| 938 |
{ |
952 |
{ |
| 939 |
$SOLAREXTRALIB = $L.$par_dir.$LIB; |
953 |
$SOLAREXTRALIB = $L.$par_dir.$LIB64; |
| 940 |
} |
954 |
} |
| 941 |
elsif ($platform eq "$Macosx") |
955 |
elsif ($platform eq "$Macosx") |
| 942 |
{ $SOLAREXTRALIB = $L.$LIB. |
956 |
{ $SOLAREXTRALIB = $L.$LIB. |