diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-04-24 23:09:51 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2001-04-24 23:09:51 (GMT) |
| commit | 56a4ecf4cc9472c5cc411db41e66c54ff671eb99 (patch) | |
| tree | bbe07c4292f3a90ac5160edf53b760590fa8e216 /bin | |
| parent | 2f588dbecda8a22470128ed7a836c08afb89bd06 (diff) | |
| download | hdf5-56a4ecf4cc9472c5cc411db41e66c54ff671eb99.zip hdf5-56a4ecf4cc9472c5cc411db41e66c54ff671eb99.tar.gz hdf5-56a4ecf4cc9472c5cc411db41e66c54ff671eb99.tar.bz2 | |
[svn-r3855] Purpose:
Sync
Description:
Putting the fix for the Modi4 compiler in the hdf5 1.4 branch since
it seems to be affecting the 1.4 branch as well.
Platforms tested:
Modi4
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/ltmain.sh | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/bin/ltmain.sh b/bin/ltmain.sh index 605ea80..6775c56 100644 --- a/bin/ltmain.sh +++ b/bin/ltmain.sh @@ -1656,7 +1656,7 @@ compiler." # Check that each of the things are valid numbers. case "$current" in - 0 | [1-9] | [1-9][0-9]*) ;; + [0-9]*) ;; *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -1665,7 +1665,7 @@ compiler." esac case "$revision" in - 0 | [1-9] | [1-9][0-9]*) ;; + [0-9]*) ;; *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -1674,7 +1674,7 @@ compiler." esac case "$age" in - 0 | [1-9] | [1-9][0-9]*) ;; + [0-9]*) ;; *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 @@ -2451,7 +2451,25 @@ EOF libdir="$hardcode_libdirs" eval rpath=\" $hardcode_libdir_flag_spec\" fi - finalize_rpath="$rpath" + + # Hack to fix the problem with compilers on Irix[56] machines which + # can't handle long -Wl flags being sent to the linker during a + # "recompile" just before execution. -BW 20. April 2001 + case "$host" in + *irix[56]*) + # Add in paths just for the HDF5 library stuff... + pwd=`pwd`; + rpath="$rpath:$pwd/.libs:$pwd/../src/.libs:$pwd/../../src/.libs"; + + # Modify the rpaths so that the compiler can handle the number + # of library paths + finalize_rpath=`echo $rpath | sed -e "s#:# ${wl}-rpath ${wl}#g"`; + compile_rpath=`echo $rpath | sed -e "s#:# ${wl}-rpath ${wl}#g"`; + ;; + *) + finalize_rpath="$rpath"; + ;; + esac output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` if test "X$output_objdir" = "X$output"; then @@ -3462,7 +3480,11 @@ libdir='$install_libdir'\ if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir="$tmpdir/libtool-$$" + tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` + if test $? = 0 ; then : + else + tmpdir="$tmpdir/libtool-$$" + fi if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : else $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 |