From: Orion P. <or...@co...> - 2015-07-08 04:32:19
|
On 07/07/2015 04:15 PM, Orion Poplawski wrote: > Updating from 3.0.5 to 3.0.6 in Fedora Rawhide has broken plplot builds. New > error: > > cd /builddir/build/BUILD/plplot-5.11.0/fedora/bindings/python && /usr/bin/swig > -python -DPL_DOUBLE_INTERFACE -DSWIG_PYTHON -DPYTHON_HAVE_PYBUFFER -outdir > /builddir/build/BUILD/plplot-5.11.0/fedora/bindings/python > -I/builddir/build/BUILD/plplot-5.11.0/include > -I/builddir/build/BUILD/plplot-5.11.0/lib/qsastime > -I/builddir/build/BUILD/plplot-5.11.0/bindings/tcl > -I/builddir/build/BUILD/plplot-5.11.0/bindings/tk > -I/builddir/build/BUILD/plplot-5.11.0/fedora > -I/builddir/build/BUILD/plplot-5.11.0/fedora/include > -I/builddir/build/BUILD/plplot-5.11.0/fedora/bindings/python -I/usr/include > -I/usr/include -I/usr/include -I/usr/include/python2.7 > -I/usr/lib/python2.7/site-packages/numpy/core/include/numpy > -I/builddir/build/BUILD/plplot-5.11.0/bindings/swig-support -o > /builddir/build/BUILD/plplot-5.11.0/fedora/bindings/python/plplotcmodulePYTHON_wrap.c > /builddir/build/BUILD/plplot-5.11.0/bindings/python/plplotcmodule.i > /builddir/build/BUILD/plplot-5.11.0/bindings/swig-support/plplotcapi.i:367: > Error: Line indented less than expected (line 2 of pythoncode) > > Line 367 is a function def: > > 367> plgcolbg( PLINT *OUTPUT, PLINT *OUTPUT, PLINT *OUTPUT ); turns out that this is fixed with the attached patch. The error message was very cryptic, and I'm not sure why the docstring is being checked for indentation, but I have a fix. On to the next error though: /usr/lib64/ccache/c++ -DPLPLOT_HAVE_CONFIG_H -Dplplot_octave_EXPORTS -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic -fPIC -I/builddir/build/BUILD/plplot-5.11.0/include -I/builddir/build/BUILD/plplot-5.11.0/lib/qsastime -I/builddir/build/BUILD/plplot-5.11.0/fedora -I/builddir/build/BUILD/plplot-5.11.0/fedora/include -I/builddir/build/BUILD/plplot-5.11.0/fedora/bindings/octave -I/usr/include/octave-4.0.0 -I/usr/include/octave-4.0.0/octave -I/builddir/build/BUILD/plplot-5.11.0/bindings/swig-support -o CMakeFiles/plplot_octave.dir/plplot_octaveOCTAVE_wrap.cxx.o -c /builddir/build/BUILD/plplot-5.11.0/fedora/bindings/octave/plplot_octaveOCTAVE_wrap.cxx /builddir/build/BUILD/plplot-5.11.0/fedora/bindings/octave/plplot_octaveOCTAVE_wrap.cxx:1638:18: error: 'hid_t' has not been declared save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { ^ #if defined (HAVE_HDF5) virtual bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) { return true; } This now appears to be caused by the update to octave 4.0.0. With 3.8.2: /usr/include/octave-3.8.2/octave/ov.h:#include "oct-hdf5.h" /usr/include/octave-3.8.2/octave/oct-hdf5.h:#include <hdf5.h> so ov.h included <hdf5.h>. But now: /usr/include/octave-4.0.0/octave/oct-hdf5.h:#include <hdf5.h> /usr/include/octave-4.0.0/octave/ls-hdf5.h:#include "oct-hdf5.h" only ls-hdf5.h or oct-hdf5.h will bring in <hdf5.h>. Also, octave's definition of save_hdf5 has changed from: bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) to bool save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats); So it looks like Lib/octave/octrun.swg needs to get updated to handle that? -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA/CoRA Division FAX: 303-415-9702 3380 Mitchell Lane or...@co... Boulder, CO 80301 http://www.cora.nwra.com |