From 4865af90af22ba2da6df905c6828b95ee35124fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr>
Date: Wed, 16 Oct 2013 17:03:26 +0200
Subject: [PATCH] [wip/hatptester] Turn the logging facility into an option
In v1.1.0 the logger was always compiled and used.
Now it is an option. If not used, the error and fatal messages
are still printed.
---
hatptester/Makefile | 17 ++++++++++++++---
hatptester/PLIST | 2 +-
hatptester/depend.mk | 2 +-
hatptester/distinfo | 6 +++---
4 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/hatptester/Makefile b/hatptester/Makefile
index abe6ec7e..6794e089 100644
--- a/hatptester/Makefile
+++ b/hatptester/Makefile
@@ -3,7 +3,7 @@
#
DISTNAME= hatptester-${VERSION}
-VERSION= 1.1.0
+VERSION= 1.2.0
PKGREVISION=
CATEGORIES= planning
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=hatptester/}
@@ -16,9 +16,21 @@ LICENSE= 2-clause-bsd
MAKE_JOBS_SAFE= yes
+PKG_SUPPORTED_OPTIONS+= enable-logger
+
+PKG_OPTION_DESCR.enable-logger= Enable the logging facility
+
+define PKG_OPTION_SET.enable-logger
+ CMAKE_ARGS+= -Dboost-logROOT=${PREFIX.boost-log}
+ include ../../devel/boost-log/depend.mk
+ CMAKE_ARGS+= -DENABLE_LOGGER=ON
+endef
+define PKG_OPTION_UNSET.enable-logger
+ CMAKGE_ARGS+= -DENABLE_LOGGER=OFF
+endef
+
USE_QMAKE= no
CMAKE_ARGS+= -DmsgconnectorROOT=${PREFIX.msgconnector}
-CMAKE_ARGS+= -Dboost-logROOT=${PREFIX.boost-log}
CMAKE_ARGS+= -DQT_QMAKE_EXECUTABLE=${QMAKE}
DEPEND_ABI.boost-libs=boost-libs>=1.34
@@ -27,7 +39,6 @@ DEPEND_ABI.boost-headers=boost-headers>=1.34
include ../../wip/msgconnector/depend.mk
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
-include ../../devel/boost-log/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/qmake.mk
include ../../mk/sysdep/qt4-libs.mk
diff --git a/hatptester/PLIST b/hatptester/PLIST
index 7ba5c2f1..8994ff25 100644
--- a/hatptester/PLIST
+++ b/hatptester/PLIST
@@ -1,4 +1,4 @@
@comment Tue Jun 25 14:49:12 CEST 2013
bin/hatptester
bin/${PKGNAME}
-lib/liblogger.so
+${PLIST.enable-logger}lib/liblogger.so
diff --git a/hatptester/depend.mk b/hatptester/depend.mk
index 892daa73..146d736e 100644
--- a/hatptester/depend.mk
+++ b/hatptester/depend.mk
@@ -14,7 +14,7 @@ PREFER.hatpconsole?= robotpkg
DEPEND_USE+= hatptester
-DEPEND_ABI.hatptester?= hatptester>=1.0.0
+DEPEND_ABI.hatptester?= hatptester>=1.2.0
DEPEND_DIR.hatptester?= ../../wip/hatptester
SYSTEM_SEARCH.hatptester=\
diff --git a/hatptester/distinfo b/hatptester/distinfo
index 9a1d5006..8a18e6f6 100644
--- a/hatptester/distinfo
+++ b/hatptester/distinfo
@@ -1,3 +1,3 @@
-SHA1 (hatptester-1.1.0.tar.gz) = b5ddcbb0cc09c425438a31d6778eab4671f6c418
-RMD160 (hatptester-1.1.0.tar.gz) = 648f065d7aeea4a170b9c24e2b85eed364e25fd4
-Size (hatptester-1.1.0.tar.gz) = 17192 bytes
+SHA1 (hatptester-1.2.0.tar.gz) = be294ca7129a0e754daabc6357c5a3c6d3982f4c
+RMD160 (hatptester-1.2.0.tar.gz) = c97086eb48108b97e64195f8f0a41d5d281f5008
+Size (hatptester-1.2.0.tar.gz) = 17794 bytes
--
GitLab