From cfa1186adecf1003cd67fd5052b3be249a259fda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Lallement?= <raphael.lallement@laas.fr> Date: Thu, 16 May 2013 16:19:08 +0200 Subject: [PATCH] [wip/msgconnector] Fix compilation issue in Fedora The linker has a different behaviour in Fedora, it needs all the libary names, it does not build the tree the same way as other linux. Fixed thanks to Anthony Mallet --- msgconnector/Makefile | 2 +- msgconnector/distinfo | 1 + msgconnector/patches/patch-bb | 13 +++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 msgconnector/patches/patch-bb diff --git a/msgconnector/Makefile b/msgconnector/Makefile index e61181c5..81710048 100644 --- a/msgconnector/Makefile +++ b/msgconnector/Makefile @@ -4,7 +4,7 @@ DISTNAME= msgconnector-${VERSION} VERSION= 2.3.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= planning MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=msgconnector/} MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}msgconnector diff --git a/msgconnector/distinfo b/msgconnector/distinfo index e3051fcc..09c4e7a3 100644 --- a/msgconnector/distinfo +++ b/msgconnector/distinfo @@ -2,3 +2,4 @@ SHA1 (msgconnector-2.3.0.tar.gz) = a369ad41734b7a4325b0adf39d40f50b98c25645 RMD160 (msgconnector-2.3.0.tar.gz) = 50f63240b4e5f1dcb1204d4a4cba3cb2a75666f4 Size (msgconnector-2.3.0.tar.gz) = 18403 bytes SHA1 (patch-aa) = 9dcc0578334b9484eebac4eda9c1e63f864d0af7 +SHA1 (patch-bb) = f7aa6776e7ab02a1336b8f743ada829e55e74ab3 diff --git a/msgconnector/patches/patch-bb b/msgconnector/patches/patch-bb new file mode 100644 index 00000000..f2bb73bb --- /dev/null +++ b/msgconnector/patches/patch-bb @@ -0,0 +1,13 @@ +diff --git CMakeLists.txt CMakeLists.txt +index 73d288f..94488d5 100644 +--- CMakeLists.txt ++++ CMakeLists.txt +@@ -84,7 +84,7 @@ ENDIF(COMPILE_BRIDGE_PRINT) + + IF(COMPILE_BRIDGE_ORO OR COMPILE_BRIDGE_OPRS) + message(STATUS "looking for boost[regex] libs") +- find_package(Boost 1.34 REQUIRED COMPONENTS regex) ++ find_package(Boost 1.34 REQUIRED COMPONENTS regex system thread) + IF(Boost_FOUND) + INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) + LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) -- GitLab