From 371a6850c470d3b35764fb5670e9ac25a772664f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr>
Date: Fri, 20 Feb 2015 19:07:14 +0100
Subject: [PATCH] [wip/hatptester] Fix compilation issue
Fix issue due to boost-log when the logger is enabled:
PKG_OPTIONS.hatptester+= enable-logger
---
hatptester/Makefile | 2 +-
hatptester/distinfo | 1 +
hatptester/patches/patch-aa | 26 ++++++++++++++++++++++++++
3 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 hatptester/patches/patch-aa
diff --git a/hatptester/Makefile b/hatptester/Makefile
index 2cd76fc8..3cdd6cd3 100644
--- a/hatptester/Makefile
+++ b/hatptester/Makefile
@@ -4,7 +4,7 @@
DISTNAME= hatptester-${VERSION}
VERSION= 1.5.1
-PKGREVISION=
+PKGREVISION= 1
CATEGORIES= planning
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=hatptester/}
MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}hatp/hatptester
diff --git a/hatptester/distinfo b/hatptester/distinfo
index ae1760d3..f134bebd 100644
--- a/hatptester/distinfo
+++ b/hatptester/distinfo
@@ -1,3 +1,4 @@
SHA1 (hatptester-1.5.1.tar.gz) = eef1f3fbdf785b27ed06394e482959a0f502c70e
RMD160 (hatptester-1.5.1.tar.gz) = 42f12fea553c5d58fc7f9a8fe4d7fb83397d6063
Size (hatptester-1.5.1.tar.gz) = 20942 bytes
+SHA1 (patch-aa) = 8f7a581b19bb0a62f2f86642dc2bb298a49cf038
diff --git a/hatptester/patches/patch-aa b/hatptester/patches/patch-aa
new file mode 100644
index 00000000..8148f44c
--- /dev/null
+++ b/hatptester/patches/patch-aa
@@ -0,0 +1,26 @@
+diff --git CMakeLists.txt CMakeLists.txt
+index d790cec..91b7553 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -14,7 +14,7 @@ set(APP_ASSOCIATED_TAG "v${APP_VERSION}") #Tag associated to the software versio
+
+ find_package(msgconnector REQUIRED msgconnector)
+ find_package(Qt4 REQUIRED COMPONENTS QtCore QtGui)
+-find_package(Boost REQUIRED thread regex signals program_options system)
++find_package(Boost REQUIRED thread regex signals program_options system date_time)
+ find_package(Threads)
+
+ if(msgconnector_FOUND)
+diff --git logger/CMakeLists.txt logger/CMakeLists.txt
+index 403a1bb..7236d3c 100644
+--- logger/CMakeLists.txt
++++ logger/CMakeLists.txt
+@@ -22,7 +22,7 @@ if(ENABLE_LOGGER)
+ include_directories(${Boost_INCLUDE_DIRS} ${boost-log_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR})
+
+ add_library(logger SHARED ${PROJECT_SOURCE_DIR}/logger/logger.cpp)
+- target_link_libraries(logger boost_regex-mt boost_date_time-mt ${boost-log_LIBRARIES})
++ target_link_libraries(logger ${boost_LIBRARIES} ${boost-log_LIBRARIES})
+ set_target_properties(logger PROPERTIES COMPILE_DEFINITIONS "LOGGER_ENABLED")
+
+ install(TARGETS logger LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
--
GitLab