From bcc75c1805b8289483cd1c84e47a101f5bbbe79e Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Thu, 19 Dec 2013 17:02:01 +0100
Subject: [PATCH] [wip/genom3] Improve boost thread configuration for the
ros/server template
Pass all the arguments to configure that ax_boost_thread expects, so that the
automatic detection of boost_thread is disabled. This this not only
cleaner/more robust but also fixes the configuration of genom3 components on
ubuntu-1310, where libboost_* have been moved to a subdirectory of /usr/lib
and the ax_boost_thread macros fail to find it automatically.
---
genom3/module.mk | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/genom3/module.mk b/genom3/module.mk
index c4aa4d57..0b9de87b 100644
--- a/genom3/module.mk
+++ b/genom3/module.mk
@@ -86,11 +86,16 @@ define PKG_OPTION_SET.ros-server
TMPL1_WRKSRC+= ${TEMPLATES_WRKDIR}/ros/server
CONFIGURE_ARGS.${TEMPLATES_WRKDIR}/ros/server+=\
- --with-boost=${PREFIX.boost-headers}
+ --with-boost=${PREFIX.boost-headers} \
+ --with-boost-libdir=$(dir ${SYSTEM_FILES.boost-lib-thread}) \
+ --with-boost-thread=boost_thread${BOOST_LIB_SUFFIX}
+
+ USE_BOOST_LIBS+= thread
pre-configure: genom3-autoreconf(ros/server)
include ../../devel/boost-headers/depend.mk
+ include ../../devel/boost-libs/depend.mk
include ../../devel/ros-ros/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
include ../../middleware/ros-actionlib/depend.mk
--
GitLab