jer 14/07/16 13:05:12 Modified: rrdtool-1.4.8-disable-rrd_graph.patch Log: Disable rdd_xport when rrd_graph is not available. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.2 net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch?r1=1.1&r2=1.2 Index: rrdtool-1.4.8-disable-rrd_graph.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rrdtool-1.4.8-disable-rrd_graph.patch 15 Jul 2014 14:04:32 -0000 1.1 +++ rrdtool-1.4.8-disable-rrd_graph.patch 16 Jul 2014 13:05:12 -0000 1.2 @@ -17,7 +17,24 @@ SV * rrd_fetch(...) PROTOTYPE: @ -@@ -397,6 +400,7 @@ +@@ -313,6 +316,7 @@ + PUSHs(sv_2mortal(newSVuv(start_tmp))); + PUSHs(sv_2mortal(newSVuv(end_tmp))); + ++#ifdef HAVE_RRD_GRAPH + int + rrd_xport(...) + PROTOTYPE: @ +@@ -371,6 +375,8 @@ + PUSHs(sv_2mortal(newRV_noinc((SV*)names))); + PUSHs(sv_2mortal(newRV_noinc((SV*)retar))); + ++#endif /* HAVE_RRD_GRAPH */ ++ + SV* + rrd_info(...) + PROTOTYPE: @ +@@ -397,6 +403,7 @@ OUTPUT: RETVAL @@ -25,7 +42,7 @@ SV* rrd_graphv(...) PROTOTYPE: @ -@@ -410,6 +414,8 @@ +@@ -410,6 +417,8 @@ OUTPUT: RETVAL @@ -120,7 +137,23 @@ static char PyRRD_updatev__doc__[] = "updatev is called in the same manner as update"; -@@ -672,13 +676,17 @@ +@@ -587,6 +591,7 @@ + return r; + } + ++#ifdef HAVE_RRD_GRAPH + static char PyRRD_xport__doc__[] = + "xport(args..): dictionary representation of data stored in RRDs\n" + " [-s|--start seconds] [-e|--end seconds] [-m|--maxrows rows]" +@@ -664,6 +669,7 @@ + destroy_args(&argv); + return r; + } ++#endif /* HAVE_RRD_GRAPH */ + + /* List of methods defined in the module */ + #define meth(name, func, doc) {name, (PyCFunction)func, METH_VARARGS, doc} +@@ -672,16 +678,22 @@ meth("create", PyRRD_create, PyRRD_create__doc__), meth("update", PyRRD_update, PyRRD_update__doc__), meth("fetch", PyRRD_fetch, PyRRD_fetch__doc__), @@ -137,7 +170,12 @@ +#endif /* HAVE_RRD_GRAPH */ meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__), meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__), ++#ifdef HAVE_RRD_GRAPH meth("xport", PyRRD_xport, PyRRD_xport__doc__), ++#endif /* HAVE_RRD_GRAPH */ + {NULL, NULL, 0, NULL} + }; + --- a/src/rrd_cgi.c +++ b/src/rrd_cgi.c @@ -56,6 +56,7 @@
