View | Details | Raw Unified | Return to issue 8585
Collapse All | Expand All

(-)oo_1.0.2_src/config_office/set_soenv.in.x86_64-config (-6 / +24 lines)
Lines 72-78 my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CV Link Here
72
#-------------------------------------------
72
#-------------------------------------------
73
#
73
#
74
# Help variables.
74
# Help variables.
75
my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
75
my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, 
76
     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
76
     $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
77
     $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
77
     $SOLARENVINC, $USR_DT, $USR_OPENWIN, $TCSH_PATH, $XLIB, $XINC,
78
     $CYGWIN, $language, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
78
     $CYGWIN, $language, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
Lines 350-355 elsif ( $platform eq "$Linux" ) Link Here
350
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
350
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
351
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
351
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
352
   }
352
   }
353
   elsif ($machine_type eq "x86_64")
354
   {  print "Setting Linux x86-64 specific values... ";
355
      $outfile        = "LinuxAMDEnv.Set"; 
356
      $CPU            = "X";
357
      $CPUNAME        = "X86_64";
358
      $DLLSUFFIX      = "lx";
359
      $OUTPATH        = "unxlngx";
360
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64";
361
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64".$ds."client";
362
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64".$ds."native_threads";
363
   }
353
   elsif ($machine_type eq "sparc")
364
   elsif ($machine_type eq "sparc")
354
   {  print "Setting Linux Sparc specific values... ";
365
   {  print "Setting Linux Sparc specific values... ";
355
      $outfile        = "LinuxSparcEnv.Set"; 
366
      $outfile        = "LinuxSparcEnv.Set"; 
Lines 413-418 if ($USE_GCC3 eq "TRUE") Link Here
413
      {
424
      {
414
        $OUTPATH      = "unxlngi4"
425
        $OUTPATH      = "unxlngi4"
415
      }
426
      }
427
      elsif ($machine_type eq "x86_64")
428
      {
429
        $OUTPATH      = "unxlngx4"
430
      }
416
	  elsif ($machine_type eq "ppc")
431
	  elsif ($machine_type eq "ppc")
417
	  {
432
	  {
418
		  $OUTPATH      = "unxlngppc4"
433
		  $OUTPATH      = "unxlngppc4"
Lines 741-746 $USR = $ds."usr"; Link Here
741
$ETC                  = $ds."etc";
756
$ETC                  = $ds."etc";
742
$BIN                  = $ds."bin";
757
$BIN                  = $ds."bin";
743
$LIB                  = $ds."lib";
758
$LIB                  = $ds."lib";
759
$LIB64                = $ds."lib";
760
$LIB64               .= "64"
761
if ($platform eq "Linux" && $machine_type eq "x86_64");
744
$INC                  = $ds."inc";
762
$INC                  = $ds."inc";
745
$INCLUDE              = $ds."include";
763
$INCLUDE              = $ds."include";
746
$DEV                  = $ds."dev";
764
$DEV                  = $ds."dev";
Lines 750-756 $SOLENV = $ds."solenv"; Link Here
750
$SOLVER               = $ds."solver";
768
$SOLVER               = $ds."solver";
751
$CONFIG               = $ds."config";
769
$CONFIG               = $ds."config";
752
$USR_BIN              = $USR.$BIN;
770
$USR_BIN              = $USR.$BIN;
753
$USR_LIB              = $USR.$LIB;
771
$USR_LIB              = $USR.$LIB64;
754
$USR_LOCAL            = $USR.$ds."local";
772
$USR_LOCAL            = $USR.$ds."local";
755
$USR_CCS              = $USR.$ds."ccs";
773
$USR_CCS              = $USR.$ds."ccs";
756
$USR_OPENWIN          = $USR.$ds."openwin";
774
$USR_OPENWIN          = $USR.$ds."openwin";
Lines 766-773 else Link Here
766
}
784
}
767
785
768
if ($STLPORT4 ne $no_stl) {
786
if ($STLPORT4 ne $no_stl) {
769
	$ps_STLPORT_LIB		= $ps.'$STLPORT4'.$LIB;
787
	$ps_STLPORT_LIB		= $ps.'$STLPORT4'.$LIB64;
770
	$L_STLPORT_LIB		= $L.'$STLPORT4'.$LIB;
788
	$L_STLPORT_LIB		= $L.'$STLPORT4'.$LIB64;
771
	$STLPORT_stlport 	= $I.'$STLPORT4'.$ds.'stlport';
789
	$STLPORT_stlport 	= $I.'$STLPORT4'.$ds.'stlport';
772
	$STLPORT_inc_stlport	= $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
790
	$STLPORT_inc_stlport	= $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
773
} else {
791
} else {
Lines 897-903 elsif (($platform eq "$Linux") || ($plat Link Here
897
                        $ps.$JRELIBDIR.
915
                        $ps.$JRELIBDIR.
898
                        $ps.$JRETOOLKITDIR.
916
                        $ps.$JRETOOLKITDIR.
899
                        $ps.$JRETHREADDIR.
917
                        $ps.$JRETHREADDIR.
900
                        $ps.$par_dir.$LIB.
918
                        $ps.$par_dir.$LIB64.
901
                        $ps_STLPORT_LIB.
919
                        $ps_STLPORT_LIB.
902
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
920
                        $ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
903
                       $ps.$ENV{'LD_LIBRARY_PATH'};
921
                       $ps.$ENV{'LD_LIBRARY_PATH'};
Lines 979-985 if ($platform eq "$Solaris") Link Here
979
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") ||  ($platform eq "$Tru64") ||
997
elsif (($platform eq "$Linux") || ($platform eq "$NetBSD") ||  ($platform eq "$Tru64") ||
980
       ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
998
       ($platform eq "$Irix") || ($platform eq "$Irix64") || ($platform eq "$FreeBSD"))
981
{
999
{
982
   $SOLAREXTRALIB     = $L.$par_dir.$LIB;
1000
   $SOLAREXTRALIB     = $L.$par_dir.$LIB64;
983
}
1001
}
984
elsif ($platform eq "$Macosx") 
1002
elsif ($platform eq "$Macosx") 
985
{  $SOLAREXTRALIB     = $L.$LIB.
1003
{  $SOLAREXTRALIB     = $L.$LIB.

Return to issue 8585