Patches against latest CVS

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

Patches against latest CVS

Albert Chin-69
1. kpathsea/Makefile.in:
     patch to allow '@' in the installation prefix (necessary for
     DFS users)
2. libcruft/dassl/ddaslv.f
     Fix warning/error with Sun Forte 6 Fortran compiler:
       "ddaslv.f", line 36: Warning: local variable "inlapack" never used
       "ddaslv.f", line 59: Error: syntax error at or near program text ""

--
albert chin ([hidden email])

-- snip snip
Index: kpathsea/Makefile.in
===================================================================
RCS file: /cvs/octave/kpathsea/Makefile.in,v
retrieving revision 1.29
diff -u -3 -p -r1.29 Makefile.in
--- kpathsea/Makefile.in 2003/01/04 20:07:21 1.29
+++ kpathsea/Makefile.in 2003/02/20 15:31:29
@@ -323,8 +323,8 @@ stamp-paths: texmf.cnf
  sed -e 's/%.*//' -e 's/^[ ]*//' -e 's/[ ]*$$//' texmf.cnf \
  | grep '^[ ]*[A-Z0-9_]*[ =]' \
  | sed '/^$$/d' \
- | sed 's/^\([^ =]*\)[ ]*=*[ ]*\(.*\)/#ifndef DEFAULT_\1@#define DEFAULT_\1 "\2"@#endif/' \
- | tr '@' '\012' \
+ | sed 's/^\([^ =]*\)[ ]*=*[ ]*\(.*\)/#ifndef DEFAULT_\1~#define DEFAULT_\1 "\2"~#endif/' \
+ | tr '~' '\012' \
  | sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
       -e 's%\$$TEXMF%$(texmf)%g' \
       -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \
Index: libcruft/dassl/ddaslv.f
===================================================================
RCS file: /cvs/octave/libcruft/dassl/ddaslv.f,v
retrieving revision 1.2
diff -u -3 -p -r1.2 ddaslv.f
--- libcruft/dassl/ddaslv.f 2003/02/18 20:00:48 1.2
+++ libcruft/dassl/ddaslv.f 2003/02/20 15:31:29
@@ -33,7 +33,7 @@ C
 C
       EXTERNAL  DGBTRS, DGETRS
 C
-      INTEGER  LIPVT, LML, LMU, LMTYPE, MEBAND, MTYPE, NPD, INLAPACK
+      INTEGER  LIPVT, LML, LMU, LMTYPE, MEBAND, MTYPE, NPD
       PARAMETER (NPD=1)
       PARAMETER (LML=1)
       PARAMETER (LMU=2)
@@ -56,7 +56,7 @@ C
 C     BANDED MATRIX
 400   MEBAND=2*IWM(LML)+IWM(LMU)+1
       CALL DGBTRS ('N', NEQ, IWM(LML), IWM(LMU), 1, WM(NPD), MEBAND,
-     *     IWM(LIPVT), DELTA, NEQ, INLPCK);
+     *     IWM(LIPVT), DELTA, NEQ, INLPCK)
       RETURN
 C------END OF SUBROUTINE DDASLV------
       END


Reply | Threaded
Open this post in threaded view
|

Re: Patches against latest CVS

David Bateman-3
According to Albert Chin <[hidden email]> (on 02/20/03):
> 1. kpathsea/Makefile.in:
>      patch to allow '@' in the installation prefix (necessary for
>      DFS users)
> 2. libcruft/dassl/ddaslv.f
>      Fix warning/error with Sun Forte 6 Fortran compiler:
>        "ddaslv.f", line 36: Warning: local variable "inlapack" never used
>        "ddaslv.f", line 59: Error: syntax error at or near program text ""

Sorry, my fault. Writing too much c and c++ code, if I'm putting ";" in
fortran :-). One change to your patch is that its probably better to
keep the INLAPACK variable but change it to INLPCK. I prefer to define
my variables in fortran.

Cheers
David

--
David Bateman                                [hidden email]
Motorola CRM                                 +33 1 69 35 25 00 (Ph)
Espace Technologique, Commune de St Aubin    +33 1 69 35 25 01 (Fax)
91193 Gif-Sur-Yvette FRANCE

The information contained in this communication has been classified as:

[x] General Business Information
[ ] Motorola Internal Use Only
[ ] Motorola Confidential Proprietary