aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2017-07-03 13:11:38 -0400
committerDave Wallace <dwallacelf@gmail.com>2017-07-17 21:00:52 -0400
commitd756b35032cdf7fdaaf0d6611388a54d32d72e92 (patch)
tree21c9626d87fde1c935755862811b339dc7338ad1 /Makefile
parent365a2b851024080c2f8f59bce2b61f243a85c254 (diff)
Fix unlinking of /dev/shm files.
- api-segment prefix not used when unlinking shm files - unlink root region on exit if no clients referenced - stale reference to freed segment name - don't add fake client to /db unless CLIB_DEBUG > 2 - turn off the gmond plugin - clean up unused vars in vpp/api Change-Id: I66451fcfd6ee64a12466c2d6c209050e3cdb74b7 Signed-off-by: Dave Wallace <dwallacelf@gmail.com> Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0d21f335c5f..46c51dd891e 100644
--- a/Makefile
+++ b/Makefile
@@ -55,8 +55,10 @@ else ifeq ($(filter rhel centos fedora opensuse,$(OS_ID)),$(OS_ID))
PKG=rpm
endif
+# +libganglia1-dev if building the gmond plugin
+
DEB_DEPENDS = curl build-essential autoconf automake bison libssl-dev ccache
-DEB_DEPENDS += debhelper dkms git libtool libganglia1-dev libapr1-dev dh-systemd
+DEB_DEPENDS += debhelper dkms git libtool libapr1-dev dh-systemd
DEB_DEPENDS += libconfuse-dev git-review exuberant-ctags cscope pkg-config
DEB_DEPENDS += lcov chrpath autoconf nasm indent
DEB_DEPENDS += python-all python-dev python-virtualenv python-pip libffi6
@@ -79,9 +81,12 @@ else
RPM_DEPENDS += python-virtualenv
RPM_DEPENDS_GROUPS = 'Development Tools'
endif
+
+# +ganglia-devel if building the ganglia plugin
+
RPM_DEPENDS += chrpath libffi-devel rpm-build
RPM_DEPENDS += https://kojipkgs.fedoraproject.org//packages/nasm/2.12.02/2.fc26/x86_64/nasm-2.12.02-2.fc26.x86_64.rpm
-EPEL_DEPENDS = libconfuse-devel ganglia-devel epel-rpm-macros
+EPEL_DEPENDS = libconfuse-devel epel-rpm-macros
ifeq ($(filter rhel centos,$(OS_ID)),$(OS_ID))
EPEL_DEPENDS += lcov
else