From 746851174f90e74dbde0a7d6321f318ff89e4081 Mon Sep 17 00:00:00 2001
From: Michele Tartara <mtartara@google.com>
Date: Wed, 24 Apr 2013 14:55:01 +0000
Subject: [PATCH] Add dependency on the process library
The tests are already using this library, so it's not really a new build
dependency, but it was not specified esplicitly.
Furthermore, it's going to be used by the instance status collector, so it's
added to the requirements for the monitoring subsystem.
Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
INSTALL | 2 ++
configure.ac | 4 ++++
devel/build_chroot | 4 +++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/INSTALL b/INSTALL
index e8957a0f6..89aa3ae8d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -192,6 +192,8 @@ a few more Haskell libraries enabled: the ``ganeti-confd`` daemon
- `vector <http://hackage.haskell.org/package/vector>`_
- `snap-server` <http://hackage.haskell.org/package/snap-server>`_, version
0.8.1 and above.
+- `process <http://hackage.haskell.org/package/process>`_, version 1.0.1.1 and
+ above
These libraries are available in Debian Wheezy (but not in Squeeze), so you
can use either apt::
diff --git a/configure.ac b/configure.ac
index e7055f550..60e9ea4e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -566,6 +566,8 @@ if test "$enable_monitoring" != no; then
[MONITORING_PKG="$MONITORING_PKG attoparsec"])
AC_GHC_PKG_CHECK([snap-server], [],
[MONITORING_PKG="$MONITORING_PKG snap-server"])
+ AC_GHC_PKG_CHECK([process], [],
+ [MONITORING_PKG="$MONITORING_PKG process"])
MONITORING_DEP=
if test "$has_confd" = False; then
MONITORING_DEP="$MONITORING_DEP confd"
@@ -615,6 +617,8 @@ AC_GHC_PKG_CHECK([temporary], [], [HS_NODEV=1])
# of the checks.
AC_GHC_PKG_CHECK([attoparsec], [], [HS_NODEV=1])
AC_GHC_PKG_CHECK([vector], [], [HS_NODEV=1])
+AC_GHC_PKG_CHECK([process], [],
+ [MONITORING_PKG="$MONITORING_PKG process"])
if test -n "$HS_NODEV"; then
AC_MSG_WARN(m4_normalize([Required development modules were not found,
you won't be able to run Haskell unittests]))
diff --git a/devel/build_chroot b/devel/build_chroot
index d14f59e23..0d04afde0 100755
--- a/devel/build_chroot
+++ b/devel/build_chroot
@@ -123,7 +123,9 @@ in_chroot -- \
MonadCatchIO-transformers==0.2.2.0 mtl==2.0.1.0 \
hashable==1.1.2.0 case-insensitive==0.3 parsec==3.0.1 \
network==2.3 snap-server==0.8.1 \
- hinotify==0.3.2
+ hinotify==0.3.2 \
+ process==1.0.1.2
+
#Python development tools
in_chroot -- \
--
GitLab