diff --git a/msgconnector/Makefile b/msgconnector/Makefile index 7975510ecb7001c43435299144c8dc3d60a6bbfd..58213a36404da19b13de5718a2039e3c87e6af32 100644 --- a/msgconnector/Makefile +++ b/msgconnector/Makefile @@ -4,7 +4,7 @@ DISTNAME= msgconnector-${VERSION} VERSION= 2.3.0 -PKGREVISION= +PKGREVISION= 1 CATEGORIES= planning MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=msgconnector/} MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}msgconnector diff --git a/msgconnector/distinfo b/msgconnector/distinfo index 8a38d4cf5b05261293b78b9baea51acb8811fd36..e3051fcc33c2b17fee39ee665d9860dffd274fed 100644 --- a/msgconnector/distinfo +++ b/msgconnector/distinfo @@ -1,3 +1,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 diff --git a/msgconnector/patches/patch-aa b/msgconnector/patches/patch-aa new file mode 100644 index 0000000000000000000000000000000000000000..81c02979ac1a51d1d49d9d3c7b65bce23a415f7f --- /dev/null +++ b/msgconnector/patches/patch-aa @@ -0,0 +1,48 @@ +diff --git isocket/iclient.hh isocket/iclient.hh +index f47421c..eefffe4 100644 +--- isocket/iclient.hh ++++ isocket/iclient.hh +@@ -4,6 +4,8 @@ + #include <sstream> + + #include <errno.h> ++#include <sys/socket.h> ++#include <sys/types.h> + #include <netinet/tcp.h> + #include <netdb.h> + #include <unistd.h> +diff --git isocket/iserver.hh isocket/iserver.hh +index 4b5d0a1..cca41f7 100644 +--- isocket/iserver.hh ++++ isocket/iserver.hh +@@ -12,6 +12,14 @@ + #include <netdb.h> + #include <fcntl.h> + ++#ifndef SOL_TCP ++# ifdef IPPROTO_TCP ++# define SOL_TCP IPPROTO_TCP ++# else ++# define SOL_TCP 6 ++# endif /* IPPROTO_TCP */ ++#endif /* SOL_TCP */ ++ + #include <imsg.hh> + #include <message.hh> + +diff --git server/CMakeLists.txt server/CMakeLists.txt +index 36a1144..817cebd 100644 +--- server/CMakeLists.txt ++++ server/CMakeLists.txt +@@ -4,6 +4,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../isocket) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../client) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../plugins) + ++find_package(Boost 1.34 REQUIRED COMPONENTS) ++if(Boost_FOUND) ++ include_directories(${Boost_INCLUDE_DIRS}) ++endif(Boost_FOUND) ++ + set(MC_CONNECTOR_S_SRC msgServer.cc) + + add_library(msgconnectorServer SHARED ${MC_CONNECTOR_S_SRC})