Attachment #3278 for issue #8585

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

Lines 80-86 my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CV Link Here

(-)oo_1.0.1_src/config_office/set_soenv.1.x86_64-config (-13 / +34 lines)
80	#-------------------------------------------	80	#-------------------------------------------
81	#	81	#
82	# Help variables.	82	# Help variables.
83	my ( $USR, $ETC, $BIN, $LIB, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,	83	my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG,
84	$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,	84	$USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
85	$SOLARENVINC, $USR_DT, $USR_OPENWIN, $PERL_PATH, $TCSH_PATH, $XLIB, $XINC, @GCC_INCLUDES,	85	$SOLARENVINC, $USR_DT, $USR_OPENWIN, $PERL_PATH, $TCSH_PATH, $XLIB, $XINC, @GCC_INCLUDES,
86	@GXX_INCLUDES, $CYGWIN, $language, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,	86	@GXX_INCLUDES, $CYGWIN, $language, $ASM_PATH, $UNZIP_PATH, $ps_STLPORT_LIB, $L_STLPORT_LIB,
Lines 367-372 elsif ( $platform eq "$Linux" ) Link Here
367	$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";	367	$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
368	$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";	368	$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
369	}	369	}
		370	elsif ($machine_type eq "x86_64")
		371	{ print "Setting Linux x86-64 specific values... ";
		372	$outfile = "LinuxAMDEnv.Set";
		373	$CPU = "X";
		374	$CPUNAME = "X86_64";
		375	$DLLSUFFIX = "lx";
		376	$OUTPATH = "unxlngx";
		377	$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64";
		378	$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64".$ds."client";
		379	$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."x86_64".$ds."native_threads";
		380	}
370	elsif ($machine_type eq "sparc")	381	elsif ($machine_type eq "sparc")
371	{ print "Setting Linux Sparc specific values... ";	382	{ print "Setting Linux Sparc specific values... ";
372	$outfile = "LinuxSparcEnv.Set";	383	$outfile = "LinuxSparcEnv.Set";
Lines 419-424 if ($USE_GCC3 eq "TRUE") Link Here
419	{	430	{
420	$OUTPATH = "unxlngi4"	431	$OUTPATH = "unxlngi4"
421	}	432	}
		433	elsif ($machine_type eq "x86_64")
		434	{
		435	$OUTPATH = "unxlngx4";
		436	}
422	}	437	}
423	else	438	else
424	{	439	{
Lines 784-789 $USR = $ds."usr"; Link Here
784	$ETC = $ds."etc";	799	$ETC = $ds."etc";
785	$BIN = $ds."bin";	800	$BIN = $ds."bin";
786	$LIB = $ds."lib";	801	$LIB = $ds."lib";
		802	$LIB64 = $ds."lib";
		803	$LIB64 .= "64"
		804	if ($platform eq "Linux" && $machine_type eq "x86_64");
787	$INC = $ds."inc";	805	$INC = $ds."inc";
788	$INCLUDE = $ds."include";	806	$INCLUDE = $ds."include";
789	$DEV = $ds."dev";	807	$DEV = $ds."dev";
Lines 793-799 $SOLENV = $ds."solenv"; Link Here
793	$SOLVER = $ds."solver";	811	$SOLVER = $ds."solver";
794	$CONFIG = $ds."config";	812	$CONFIG = $ds."config";
795	$USR_BIN = $USR.$BIN;	813	$USR_BIN = $USR.$BIN;
796	$USR_LIB = $USR.$LIB;	814	$USR_LIB = $USR.$LIB64;
797	$USR_LOCAL = $USR.$ds."local";	815	$USR_LOCAL = $USR.$ds."local";
798	$USR_CCS = $USR.$ds."ccs";	816	$USR_CCS = $USR.$ds."ccs";
799	$USR_OPENWIN = $USR.$ds."openwin";	817	$USR_OPENWIN = $USR.$ds."openwin";
Lines 801-808 $USR_DT = $USR.$ds."dt"; Link Here
801	$COMMON_BUILD_TOOLS = '$SRC_ROOT'.$ds."external".$ds."common";	819	$COMMON_BUILD_TOOLS = '$SRC_ROOT'.$ds."external".$ds."common";
802		820
803	if ($STLPORT4 ne $no_stl) {	821	if ($STLPORT4 ne $no_stl) {
804	$ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB;	822	$ps_STLPORT_LIB = $ps.'$STLPORT4'.$LIB64;
805	$L_STLPORT_LIB = $L.'$STLPORT4'.$LIB;	823	$L_STLPORT_LIB = $L.'$STLPORT4'.$LIB64;
806	$STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport';	824	$STLPORT_stlport = $I.'$STLPORT4'.$ds.'stlport';
807	$STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';	825	$STLPORT_inc_stlport = $I.'$STLPORT4'.$ds.'include'.$ds.'stlport';
808	} else {	826	} else {
Lines 915-924 $STAR_REGISTRY = '$STAR_RESOURCEP Link Here
915	$DMAKEROOT = '$SOLARENVINC'.$ds."startup";	933	$DMAKEROOT = '$SOLARENVINC'.$ds."startup";
916	# Location of JDK classes .zip file.	934	# Location of JDK classes .zip file.
917	# but in jdk 1.2 it is called rt.jar and it lives in jre/lib	935	# but in jdk 1.2 it is called rt.jar and it lives in jre/lib
918	$CLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar";	936	$CLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB64.$ds."rt.jar";
919	# Location of the JDK supported standard classes.zip file.	937	# Location of the JDK supported standard classes.zip file.
920	# see above for why the change	938	# see above for why the change
921	$XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB.$ds."rt.jar";	939	$XCLASSPATH = '$JAVA_HOME'.$ds.'jre'.$LIB64.$ds."rt.jar";
922	# Paths to run time shared libraries.	940	# Paths to run time shared libraries.
923	if ($platform eq "$Solaris")	941	if ($platform eq "$Solaris")
924	{ $LD_LIBRARY_PATH = $cur_dir.	942	{ $LD_LIBRARY_PATH = $cur_dir.
Lines 932-939 if ($platform eq "$Solaris") Link Here
932	elsif (($platform eq "$Linux") \|\| ($platform eq "$FreeBSD") \|\| ($platform eq "$NetBSD") \|\| ($platform eq "$Tru64"))	950	elsif (($platform eq "$Linux") \|\| ($platform eq "$FreeBSD") \|\| ($platform eq "$NetBSD") \|\| ($platform eq "$Tru64"))
933	{ $LD_LIBRARY_PATH = $cur_dir.	951	{ $LD_LIBRARY_PATH = $cur_dir.
934	$ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.	952	$ps.'$SOLARENV'.$ds.'$INPATH'.$LIB.
935	$ps.$USR_LOCAL.$LIB.	953	$ps.$USR_LOCAL.$LIB64.
936	$ps.$par_dir.$LIB.	954	$ps.$par_dir.$LIB.
		955	$ps.$par_dir.$LIB64.
937	$ps_STLPORT_LIB.	956	$ps_STLPORT_LIB.
938	$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;	957	$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB;
939	}	958	}
Lines 999-1007 if ($platform eq "$Solaris") Link Here
999	}	1018	}
1000	elsif (($platform eq "$Linux") \|\| ($platform eq "$FreeBSD") \|\| ($platform eq "$NetBSD") \|\| ($platform eq "$Tru64") \|\| ($platform eq "$Irix") \|\| ($platform eq "$Irix64"))	1019	elsif (($platform eq "$Linux") \|\| ($platform eq "$FreeBSD") \|\| ($platform eq "$NetBSD") \|\| ($platform eq "$Tru64") \|\| ($platform eq "$Irix") \|\| ($platform eq "$Irix64"))
1001	{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.	1020	{ $SOLAREXTRALIB = '"'.$L.$par_dir.$LIB.
1002	$L.$LIB.	1021	$L.$par_dir.$LIB64.
1003	$L.$USR.$LIB.	1022	$L.$LIB64.
1004	$L.$USR.$LOCAL.$LIB.'"';	1023	$L.$USR.$LIB64.
		1024	$L.$USR.$LOCAL.$LIB64.'"';
1005	}	1025	}
1006	elsif ($platform eq "$Macosx")	1026	elsif ($platform eq "$Macosx")
1007	{ $SOLAREXTRALIB = '"'.$L.$LIB.	1027	{ $SOLAREXTRALIB = '"'.$L.$LIB.
Lines 1095-1101 elsif (($platform eq "$Linux") or ($plat Link Here
1095	$ps.$ETC.	1115	$ps.$ETC.
1096	$ps.$USR.$BIN.$ds."X11".	1116	$ps.$USR.$BIN.$ds."X11".
1097	$ps.$USR.$ds."X11".$BIN.	1117	$ps.$USR.$ds."X11".$BIN.
1098	$ps.$USR.$LIB;	1118	$ps.$USR.$LIB64;
1099	}	1119	}
1100	elsif ($platform eq "$Winnt")	1120	elsif ($platform eq "$Winnt")
1101	{	1121	{
Lines 1199-1210 if ($platform eq "$Solaris") Link Here
1199	}	1219	}
1200	elsif (($platform eq "$Linux") \|\| ($platform eq "$FreeBSD") \|\| ($platform eq "$NetBSD") \|\| ($platform eq "$Tru64") \|\| ($platform eq "$Irix") \|\| ($platform eq "$Irix64"))	1220	elsif (($platform eq "$Linux") \|\| ($platform eq "$FreeBSD") \|\| ($platform eq "$NetBSD") \|\| ($platform eq "$Tru64") \|\| ($platform eq "$Irix") \|\| ($platform eq "$Irix64"))
1201	{ $SOLARLIB = '"'.$L.$par_dir.$LIB.	1221	{ $SOLARLIB = '"'.$L.$par_dir.$LIB.
		1222	$L.$par_dir.$LIB64.
1202	$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.	1223	$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1203	$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.	1224	$L.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$LIB.
1204	$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.	1225	$L.'$SOLARENV'.$ds.'$OUTPATH'.$LIB.
1205	$L.$LIB.	1226	$L.$LIB64.
1206	$L.$USR_LIB.	1227	$L.$USR_LIB.
1207	$L.$USR_LOCAL.$LIB.	1228	$L.$USR_LOCAL.$LIB64.
1208	$L.'$JAVA_HOME'.$LIB.	1229	$L.'$JAVA_HOME'.$LIB.
1209	$L.$JRELIBDIR.	1230	$L.$JRELIBDIR.
1210	$L.$JRETOOLKITDIR.	1231	$L.$JRETOOLKITDIR.

Lines 250-256 if test "$_os" = "Linux" -o "$_os" = "Fr Link Here

(-)oo_1.0.1_src/config_office/configure.in.x86_64-config (-1 / +12 lines)
250		250
251	AC_PROG_CC	251	AC_PROG_CC
252	COMPATH=`echo $CC \| $SED -n "s,/[^/]\+$,,p"`	252	COMPATH=`echo $CC \| $SED -n "s,/[^/]\+$,,p"`
253	_gcc_include_start=/usr/lib/gcc-lib	253	_gcc_include_start=`$CC -print-search-dirs \| sed -n "/install: $.gcc-lib$./s//\1/p"`
254	_gxx_include_start=/usr/include	254	_gxx_include_start=/usr/include
255		255
256	else	256	else
Lines 824-829 if test "$JAVA"; then Link Here
824	_jdk_minor="true"	824	_jdk_minor="true"
825	fi	825	fi
826	fi	826	fi
		827	if test "$_os" = "Linux" -a "$_machine_type" = "x86_64"; then
		828	_jdk_middle=`echo $_jdk \| $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
		829	_jdk_middle3=`echo $_jdk \| $AWK -F. '{ if ($2 != 3) print "false"; else print "true" }'`
		830
		831	if test "$_jdk_middle" = "false" -a "$_jdk_middle3" = "true"; then
		832	_jdk_minor="true"
		833	fi
		834	fi
827	if test "$_os" = "NetBSD"; then	835	if test "$_os" = "NetBSD"; then
828	_jdk_middle=`echo $_jdk \| $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`	836	_jdk_middle=`echo $_jdk \| $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
829	fi	837	fi
Lines 866-871 if test "$JAVA"; then Link Here
866	if test "$_machine_type" = "i686"; then	874	if test "$_machine_type" = "i686"; then
867	_jdk_minor=`echo $_jdk \| $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`	875	_jdk_minor=`echo $_jdk \| $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
868	fi	876	fi
		877	if test "$_machine_type" = "x86_64"; then
		878	_jdk_minor=`echo $_jdk \| $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
		879	fi
869	if test "$_machine_type" = "sparc"; then	880	if test "$_machine_type" = "sparc"; then
870	_jdk_minor=`echo $_jdk \| $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`	881	_jdk_minor=`echo $_jdk \| $AWK -F. '{ if ($3 != 2) print "false"; else print "true" }'`
871	fi	882	fi

Return to issue 8585