Gilles Filippini a écrit , Le 09/08/2014 17:57: > Hi Mike, > > Sorry about the late answer. Connectivity is flaky on my holidays place. > > Mike Miller a écrit , Le 08/08/2014 16:22: >> On Wed, Aug 6, 2014 at 08:03:14 +0200, Gilles Filippini wrote: >>> Thanks for that. In the mean time is it possible for you to upload a >>> fixed octave package to unstable to ease the transition? >> >> I think one of us will get to uploading a fixed octave package soon, >> there are other pending changes in git, and we don't want to hold up >> the transition. >> >> I haven't tested building octave rdeps with these patches, but I >> assume that's the reason for hdf5-mkoctfile.patch right?. I'm curious >> if the change to LDFLAGS is really necessary in the general case, or >> is it only there for the one or two packages that intentionally link >> to hdf5 themselves? I would think only the include path would be >> required for almost all uses of mkoctfile, in which case it could look >> more like mkoctfile-mpi.diff (which I think we can actually drop once >> the hdf5 transition is done). > > Thanks for this feedback. I think you're right because I've had to set > CPPFLAGS only to build octave rdeps against an unpatched octave. I'll > test this ASAP and tell you. You were right. I've have to update hdf5-mkoctfile.patch to use INCFLAGS instead of CPPFLAGS because the latter is superseded by existing CPPFLAGS environment variable. Please find attached an updated version of hdf5-mkoctfile.patch. I've tested it against the build of dynare which is a rdep of liboctave-dev. Thanks, _g.
Description: Add hdf5 path to INCFLAGS in mkoctfile
so that packages build-depending on octave-dev don't have to care.
Index: octave-3.8.1/src/mkoctfile.in.cc
===================================================================
--- octave-3.8.1.orig/src/mkoctfile.in.cc 2014-08-09 20:03:27.000000000 +0200
+++ octave-3.8.1/src/mkoctfile.in.cc 2014-08-10 00:35:23.963925337 +0200
@@ -123,6 +123,7 @@
= "-I" + quote_path (vars["OCTINCLUDEDIR"] + "/..")
+ " -I" + quote_path (vars["OCTINCLUDEDIR"]);
#endif
+ DEFAULT_INCFLAGS += std::string(" ") + %OCTAVE_CONF_HDF5_CPPFLAGS%;
if (vars["INCLUDEDIR"] != "/usr/include")
DEFAULT_INCFLAGS += " -I" + quote_path (vars["INCLUDEDIR"]);
Attachment:
signature.asc
Description: OpenPGP digital signature