Mercurial > hg > octave-terminal
changeset 2600:c454cd888ada
[project @ 1996-12-19 22:35:54 by jwe]
author | jwe |
---|---|
date | Thu, 19 Dec 1996 22:35:55 +0000 |
parents | 9705ea40f0a2 |
children | 3723512a827a |
files | ChangeLog README.Linux aclocal.m4 src/ChangeLog src/oct-stream.cc src/sighandlers.cc |
diffstat | 6 files changed, 50 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 19 16:18:59 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * aclocal.m4 (OCTAVE_FLIBS): Only add -Xlinker args if compiler is + gcc. + Sat Dec 14 09:46:50 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * README.Linux: New file.
--- a/README.Linux +++ b/README.Linux @@ -100,6 +100,19 @@ from sunsite.unc.edu in the directory /pub/Linux/devel/lang/fortran. There is also a Debian package for g77. +Problems with g77 on Debian 1.2 systems (and possibly others) +------------------------------------------------------------- + +The location of the compiler binaries has changed, so the g77 0.5.18 +package can not be used without modification. The problem is that the +Debian package was built for gcc 2.7.2 and not 2.7.2.1 and the f771 +backend is installed in the wrong directory. + +Version 0.5.19 of g77 has just been released. A fixed Debian package +may be made available soon. Until then, you can make things work by +copying f771 and libf2c.a from /usr/lib/gcc-lib/i486-linux/2.7.2 to +/usr/lib/gcc-lib/i486-linux/2.7.2.1. + Upgrading your compiler and libraries ------------------------------------- @@ -116,4 +129,4 @@ University of Wisconsin-Madison Department of Chemical Engineering -Tue Dec 17 13:24:52 1996 +Thu Dec 19 13:07:46 1996
--- a/aclocal.m4 +++ b/aclocal.m4 @@ -134,7 +134,11 @@ dnl systems... dnl if test -n "$ld_run_path"; then - ld_run_path="-Xlinker -R -Xlinker $ld_run_path" + if test "$ac_cv_prog_gcc" = yes; then + ld_run_path="-Xlinker -R -Xlinker $ld_run_path" + else + ld_run_path="-R $ld_run_path" + fi fi dnl flibs= @@ -174,7 +178,11 @@ if $exists; then arg= else - lflags="$lflags -Xlinker $arg" + if test "$ac_cv_prog_gcc" = yes; then + lflags="$lflags -Xlinker $arg" + else + lflags="$lflags $arg" + fi fi ;; -lang*)
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +Thu Dec 19 12:13:42 1996 John W. Eaton <jwe@bevo.che.wisc.edu> + + * oct-stream.cc (octave_base_stream::do_scanf): + Don't treat %l{e,f,g} differently from %{e,f,g}. + (octave_base_stream::do_oscanf): Likewise. + + * sighandlers.cc (sigchld_handler): Fix typos. + Wed Dec 18 20:17:23 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * file-io.cc (Ffgetl, Ffgets): Also return number of characters read.
--- a/src/oct-stream.cc +++ b/src/oct-stream.cc @@ -887,9 +887,11 @@ do_scanf_conv (istream&, const char*, int*, Matrix&, double*, int&, int, int, bool); +#if 0 template void do_scanf_conv (istream&, const char*, float*, Matrix&, double*, int&, int, int, bool); +#endif template void do_scanf_conv (istream&, const char*, double*, Matrix&, double*, int&, @@ -982,20 +984,10 @@ case 'e': case 'f': case 'g': { - if (elt->modifier == 'l') - { - double tmp; - - do_scanf_conv (is, fmt, &tmp, mval, data, - count, nr, max_size, discard); - } - else - { - float tmp; - - do_scanf_conv (is, fmt, &tmp, mval, data, - count, nr, max_size, discard); - } + double tmp; + + do_scanf_conv (is, fmt, &tmp, mval, data, count, + nr, max_size, discard); } break; @@ -1231,8 +1223,10 @@ template octave_value do_oscanf_num_conv (istream&, const char*, int*, bool); +#if 0 template octave_value do_oscanf_num_conv (istream&, const char*, float*, bool); +#endif template octave_value do_oscanf_num_conv (istream&, const char*, double*, bool); @@ -1298,18 +1292,9 @@ case 'e': case 'f': case 'g': { - if (elt->modifier == 'l') - { - double tmp; - - retval = do_oscanf_num_conv (is, fmt, &tmp, discard); - } - else - { - float tmp; - - retval = do_oscanf_num_conv (is, fmt, &tmp, discard); - } + double tmp; + + retval = do_oscanf_num_conv (is, fmt, &tmp, discard); } break;
--- a/src/sighandlers.cc +++ b/src/sighandlers.cc @@ -194,7 +194,7 @@ = octave_ignore_interrupts (); volatile sig_handler *saved_sigchld_handler - = octave_set_sighanlder (SIGCHLD, SIG_IGN); + = octave_set_signal_hanlder (SIGCHLD, SIG_IGN); #endif int n = octave_child_list::length (); @@ -231,7 +231,7 @@ } #if defined (__EMX__) - octave_set_inerrupt_handler (saved_interrupt_handler); + octave_set_interrupt_handler (saved_interrupt_handler); octave_set_signal_handler (SIGCHLD, saved_sigchld_handler); #endif