Attachment #4794 for issue #11623

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

Lines 85-91 sd_setup_binary=setup.bin Link Here

(-)script/setup.sh (-2 / +2 lines)
85	sd_platform=`uname -s`	85	sd_platform=`uname -s`
86	sd_release=`uname -r`	86	sd_release=`uname -r`
87		87
88	if [ $sd_platform == "IRIX64" ]; then	88	if [ $sd_platform = "IRIX64" ]; then
89	# IRIX and IRIX64 are the same for our purposes	89	# IRIX and IRIX64 are the same for our purposes
90	sd_platform=IRIX	90	sd_platform=IRIX
91	fi	91	fi
Lines 146-152 esac Link Here
146	if [ -x "./javaldx" ]; then	146	if [ -x "./javaldx" ]; then
147	java_ld_library_path=`"./javaldx" "--search-for-java" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"`	147	java_ld_library_path=`"./javaldx" "--search-for-java" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"`
148	if [ "$java_ld_library_path" != "" ] ; then	148	if [ "$java_ld_library_path" != "" ] ; then
149	if [ $sd_platform == "IRIX" ]; then	149	if [ $sd_platform = "IRIX" ]; then
150	LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}	150	LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
151	else	151	else
152	LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}	152	LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}

Lines 64-70 Link Here

(-)source/custom/jvmsetup/loader/jvmsetup.sh (-2 / +2 lines)
64	# resolve installation directory	64	# resolve installation directory
65	sd_platform=`uname -s`	65	sd_platform=`uname -s`
66		66
67	if [ $sd_platform == "IRIX64" ]; then	67	if [ $sd_platform = "IRIX64" ]; then
68	sd_platform=IRIX	68	sd_platform=IRIX
69	fi	69	fi
70		70
Lines 122-128 esac Link Here
122	# extend the ld_library_path for java: javaldx checks the sofficerc for us	122	# extend the ld_library_path for java: javaldx checks the sofficerc for us
123	java_ld_library_path=`"$sd_inst/program/javaldx" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"`	123	java_ld_library_path=`"$sd_inst/program/javaldx" "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$8" "$9"`
124	if [ "$java_ld_library_path" != "" ] ; then	124	if [ "$java_ld_library_path" != "" ] ; then
125	if [ $sd_platform == "IRIX" ] ; then	125	if [ $sd_platform = "IRIX" ] ; then
126	LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}	126	LD_LIBRARYN32_PATH=${java_ld_library_path}:${LD_LIBRARYN32_PATH}
127	else	127	else
128	LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}	128	LD_LIBRARY_PATH=${java_ld_library_path}:${LD_LIBRARY_PATH}

Return to issue 11623