* [gentoo-commits] gentoo-x86 commit in net-analyzer/rrdtool/files: rrdtool-1.4.8-disable-rrd_graph.patch
@ 2014-07-15 14:04 Jeroen Roovers (jer)
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2014-07-15 14:04 UTC (permalink / raw
To: gentoo-commits
jer 14/07/15 14:04:32
Added: rrdtool-1.4.8-disable-rrd_graph.patch
Log:
When USE=-graph, do not compile rrd_graph* support into dependent libraries.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path
1.1 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.1&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.1&content-type=text/plain
Index: rrdtool-1.4.8-disable-rrd_graph.patch
===================================================================
--- a/bindings/perl-shared/RRDs.xs
+++ b/bindings/perl-shared/RRDs.xs
@@ -189,6 +189,7 @@
OUTPUT:
RETVAL
+#ifdef HAVE_RRD_GRAPH
SV *
rrd_graph(...)
PROTOTYPE: @
@@ -235,6 +236,8 @@
PUSHs(sv_2mortal(newSViv(xsize)));
PUSHs(sv_2mortal(newSViv(ysize)));
+#endif /* HAVE_RRD_GRAPH */
+
SV *
rrd_fetch(...)
PROTOTYPE: @
@@ -397,6 +400,7 @@
OUTPUT:
RETVAL
+#ifdef HAVE_RRD_GRAPH
SV*
rrd_graphv(...)
PROTOTYPE: @
@@ -410,6 +414,8 @@
OUTPUT:
RETVAL
+#endif /* HAVE_RRD_GRAPH */
+
int
rrd_dump(...)
PROTOTYPE: @
--- a/bindings/lua/rrdlua.c
+++ b/bindings/lua/rrdlua.c
@@ -267,6 +267,7 @@
return 1;
}
+#ifdef HAVE_RRD_GRAPH
static int
lua_rrd_graph (lua_State * L)
{
@@ -291,6 +292,7 @@
rrd_freemem(calcpr);
return 3;
}
+#endif /* HAVE_RRD_GRAPH */
static int
lua_rrd_flushcached(lua_State *L)
@@ -305,11 +307,13 @@
return lua_rrd_infocall(L, "info", rrd_info);
}
+#ifdef HAVE_RRD_GRAPH
static int
lua_rrd_graphv (lua_State * L)
{
return lua_rrd_infocall(L, "graphv", rrd_graph_v);
}
+#endif /* HAVE_RRD_GRAPH */
static int
lua_rrd_updatev (lua_State * L)
@@ -347,7 +351,9 @@
{"dump", lua_rrd_dump},
{"fetch", lua_rrd_fetch},
{"first", lua_rrd_first},
+#ifdef HAVE_RRD_GRAPH
{"graph", lua_rrd_graph},
+#endif /* HAVE_RRD_GRAPH */
{"last", lua_rrd_last},
{"resize", lua_rrd_resize},
{"restore", lua_rrd_restore},
@@ -357,7 +363,9 @@
#if defined(DINF)
{"info", lua_rrd_info},
{"updatev", lua_rrd_updatev},
+#ifdef HAVE_RRD_GRAPH
{"graphv", lua_rrd_graphv},
+#endif /* HAVE_RRD_GRAPH */
#endif
{NULL, NULL}
};
--- a/bindings/python/rrdtoolmodule.c
+++ b/bindings/python/rrdtoolmodule.c
@@ -261,6 +261,7 @@
return r;
}
+#ifdef HAVE_RRD_GRAPH
static char PyRRD_graph__doc__[] =
"graph(args..): Create a graph based on data from one or several RRD\n"
" graph filename [-s|--start seconds] "
@@ -327,6 +328,7 @@
destroy_args(&argv);
return r;
}
+#endif /* HAVE_RRD_GRAPH */
static char PyRRD_tune__doc__[] =
"tune(args...): Modify some basic properties of a Round Robin Database\n"
@@ -503,6 +505,7 @@
return r;
}
+#ifdef HAVE_RRD_GRAPH
static char PyRRD_graphv__doc__[] =
"graphv is called in the same manner as graph";
@@ -530,6 +533,7 @@
destroy_args(&argv);
return r;
}
+#endif /* HAVE_RRD_GRAPH */
static char PyRRD_updatev__doc__[] =
"updatev is called in the same manner as update";
@@ -672,13 +676,17 @@
meth("create", PyRRD_create, PyRRD_create__doc__),
meth("update", PyRRD_update, PyRRD_update__doc__),
meth("fetch", PyRRD_fetch, PyRRD_fetch__doc__),
+#ifdef HAVE_RRD_GRAPH
meth("graph", PyRRD_graph, PyRRD_graph__doc__),
+#endif /* HAVE_RRD_GRAPH */
meth("tune", PyRRD_tune, PyRRD_tune__doc__),
meth("first", PyRRD_first, PyRRD_first__doc__),
meth("last", PyRRD_last, PyRRD_last__doc__),
meth("resize", PyRRD_resize, PyRRD_resize__doc__),
meth("info", PyRRD_info, PyRRD_info__doc__),
+#ifdef HAVE_RRD_GRAPH
meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__),
+#endif /* HAVE_RRD_GRAPH */
meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__),
meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__),
meth("xport", PyRRD_xport, PyRRD_xport__doc__),
--- a/src/rrd_cgi.c
+++ b/src/rrd_cgi.c
@@ -56,6 +56,7 @@
const char **);
/* call rrd_graph and insert appropriate image tag */
+#ifdef HAVE_RRD_GRAPH
char *drawgraph(
long,
const char **);
@@ -64,6 +65,7 @@
char *drawprint(
long,
const char **);
+#endif /* HAVE_RRD_GRAPH */
/* pretty-print the <last></last> value for some.rrd via strftime() */
char *printtimelast(
@@ -542,9 +544,13 @@
}
parse(&buffer, i, "<RRD::GETVAR", rrdgetvar);
parse(&buffer, i, "<RRD::GOODFOR", rrdgoodfor);
+#ifdef HAVE_RRD_GRAPH
parse(&buffer, i, "<RRD::GRAPH", drawgraph);
+#endif /* HAVE_RRD_GRAPH */
parse(&buffer, i, "<RRD::INCLUDE", includefile);
+#ifdef HAVE_RRD_GRAPH
parse(&buffer, i, "<RRD::PRINT", drawprint);
+#endif /* HAVE_RRD_GRAPH */
parse(&buffer, i, "<RRD::SETCONSTVAR", rrdsetvarconst);
parse(&buffer, i, "<RRD::SETENV", rrdsetenv);
parse(&buffer, i, "<RRD::SETVAR", rrdsetvar);
@@ -929,7 +935,7 @@
}
-
+#ifdef HAVE_RRD_GRAPH
char *drawgraph(
long argc,
const char **args)
@@ -961,6 +967,7 @@
}
return NULL;
}
+#endif /* HAVE_RRD_GRAPH */
char *drawprint(
long argc,
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-analyzer/rrdtool/files: rrdtool-1.4.8-disable-rrd_graph.patch
@ 2014-07-16 13:05 Jeroen Roovers (jer)
0 siblings, 0 replies; 2+ messages in thread
From: Jeroen Roovers (jer) @ 2014-07-16 13:05 UTC (permalink / raw
To: gentoo-commits
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 @@
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-16 13:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-16 13:05 [gentoo-commits] gentoo-x86 commit in net-analyzer/rrdtool/files: rrdtool-1.4.8-disable-rrd_graph.patch Jeroen Roovers (jer)
-- strict thread matches above, loose matches on Subject: below --
2014-07-15 14:04 Jeroen Roovers (jer)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox