Re: [Pkg-octave-devel] All packages are in SVN now
[Cc: to A S Hodel]
* Dirk Eddelbuettel <edd@debian.org> [2005-02-13 13:52]:
> On 13 February 2005 at 20:31, Rafael Laboissiere wrote:
>
> | I see at ftp://ftp.eng.auburn.edu/pub/hodel/ the following:
> |
> | semidef-oct-2.2.tar.gz 695 KB 11/23/2001 12:00:00 AM
> | semidef-oct-2003.tar.gz 318 KB 04/07/2003 12:00:00 AM
>
> Very attentive :) Same on my box:
>
> edd@chibud:~> ls -dl src/debian/Octave/semidef-oct-*
> drwxr-xr-x 6 edd edd 4096 Feb 26 2004 src/debian/Octave/semidef-oct-2.2
> drwx------ 5 edd edd 4096 Nov 22 2003 src/debian/Octave/semidef-oct-2003
> edd@chibud:~> ls -dl src/debian/Octave/semidef-oct-*/debian/changelog
> -rw-r--r-- 1 edd edd 7633 Dec 4 10:43 src/debian/Octave/semidef-oct-2.2/debian/changelog
> -rw-r--r-- 1 edd edd 5188 Jul 1 2003 src/debian/Octave/semidef-oct-2003/debian/changelog
>
> | From the dates, I assume that version 2003 is more recent than 2.2,
> | although using the year as version was the old style used by A. Hodel. At
> | any rate, I am having trouble in building the package (compilation errors).
> | I will investigate this soon.
>
> IIRC -2003 never built for me.
I could make it build with g++ 3.3.5 using the two patches attached below.
The demosp script also works fine from the Octave prompt. I am going to
upload soon version 2003-1.
> I'll CC Paul. Paul -- you may want to join this list and the Debian Octave
> team on alioth.debian.org. Non-Debianers gets so called guest accounts
> (i.e. pkienzle-guest) and can join in just like the rest of us; but
> Debianers need to make the uploads.
Paul would be most welcome!
--
Rafael
#! /bin/sh /usr/share/dpatch/dpatch-run
## 50_strstream-namespace-std.dpatch by Rafael Labossiere <rafael@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: 1) Include <strstream> instead of <strstream.h>, since the later is
## DP: not found by g++ v3.3.5
## DP: 2) Use ostrstream in std namespace
@DPATCH@
--- semidef-oct-2003.orig/SRC/get_matrix.cc
+++ semidef-oct-2003/SRC/get_matrix.cc
@@ -17,7 +17,7 @@
if( !( arg.is_numeric_type()
&& (arg.is_matrix_type() || arg.is_scalar_type ())) )
{
- ostrstream errmesg;
+ std::ostrstream errmesg;
errmesg << caller << "expecting real matrix for argument"
<< argnum << ends;
error(errmesg.str());
--- semidef-oct-2003.orig/SRC/get_real_scalar.cc
+++ semidef-oct-2003/SRC/get_real_scalar.cc
@@ -11,7 +11,7 @@
int argnum, int signflg, int& errflg)
{
double retval = 0;
- ostrstream errmesg;
+ std::ostrstream errmesg;
if ( !( arg.is_real_type() && arg.is_scalar_type() ) )
{
--- semidef-oct-2003.orig/SRC/get_vector.cc
+++ semidef-oct-2003/SRC/get_vector.cc
@@ -15,7 +15,7 @@
<< argnum << ", errflg=" << errflg << endl;
#endif
ColumnVector retval(0);
- ostrstream errmesg;
+ std::ostrstream errmesg;
if(arg.is_empty() )
return retval;
--- semidef-oct-2003.orig/SRC/ocst.h
+++ semidef-oct-2003/SRC/ocst.h
@@ -8,7 +8,7 @@
#include <iostream.h>
#include <math.h>
#include <string.h>
-#include <strstream.h>
+#include <strstream>
#include <utils.h>
#include <octave/defun-dld.h>
--- semidef-oct-2003.orig/SRC/sp.cc
+++ semidef-oct-2003/SRC/sp.cc
@@ -10,7 +10,7 @@
#include <iostream.h>
#include <math.h>
#include <string.h>
-#include <strstream.h>
+#include <strstream>
#include <utils.h>
#include <octave/defun-dld.h>
@@ -417,7 +417,7 @@
}
// information string output
- ostrstream infostr;
+ std::ostrstream infostr;
switch (info)
{
case 1:
#! /bin/sh /usr/share/dpatch/dpatch-run
## 50_src-makefile.dpatch by Rafael Labossiere <rafael@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: 1) Add CXXFLAGS=-Wno-deprecated flag to all calls of mkoctfile
## DP: 2) Add -Duserusage when generating sp.oct, to avoid problems with
## DP: undefined CLK_TCK
## DP: 3) Removed some objects from the SP_DEP list which are already in
## DP: Octave's libcruftoriginal set
@DPATCH@
--- semidef-oct-2003.orig/SRC/Makefile
+++ semidef-oct-2003/SRC/Makefile
@@ -1,24 +1,32 @@
%.oct : %.cc $(OCT_LIBS) ocst.h
@echo "making $@ from $<"
- mkoctfile $< -locst -lm
+ CXXFLAGS=-Wno-deprecated mkoctfile $< -locst -lm
%.o : %.cc ocst.h
@echo "making $@ from $<"
- mkoctfile $<
+ CXXFLAGS=-Wno-deprecated mkoctfile $<
rm -f $*.oct
-OCT_FILES = sp.oct
+OCT_FILES = sp.oct
all: $(OCT_FILES)
+# original set
+#SP_DEP= sp.cc get_matrix.o get_real_scalar.o get_vector.o sp_src.c \
+# dgels.f dopgtr.f dspgv.f dsptrd.f dtrsv.f lse.f \
+# dlansp.f dpptrf.f dspmv.f dtpmv.f lce.f xerbla.f \
+# dlantr.f dspev.f dspr.f dtpsv.f lde.f \
+# dlatrs.f dspgst.f dspr2.f dtrcon.f lsame.f
+
+# pruned by three files found in Octave's libcruftoriginal set
SP_DEP= sp.cc get_matrix.o get_real_scalar.o get_vector.o sp_src.c \
- dgels.f dopgtr.f dspgv.f dsptrd.f dtrsv.f lse.f \
- dlansp.f dpptrf.f dspmv.f dtpmv.f lce.f xerbla.f \
+ dgels.f dopgtr.f dspgv.f dsptrd.f lse.f \
+ dlansp.f dpptrf.f dspmv.f dtpmv.f lce.f \
dlantr.f dspev.f dspr.f dtpsv.f lde.f \
- dlatrs.f dspgst.f dspr2.f dtrcon.f lsame.f
+ dlatrs.f dspgst.f dspr2.f dtrcon.f
sp.oct: $(SP_DEP)
- mkoctfile $(SP_DEP)
+ CXXFLAGS=-Wno-deprecated mkoctfile -Duserusage $(SP_DEP)
clean:
rm -f *.o *.oct *.a *.so *.so.1 core octave-core
Reply to: