From 001e229f54bcacdce4aae0a10b069e4db38e205f Mon Sep 17 00:00:00 2001 From: Lukas Bulwahn Date: Sun, 19 Mar 2017 05:20:29 +0100 Subject: [PATCH] zeroconf-avahi-suite: initial recipes --- .../files/0001-address-gcc6-build-error.patch | 63 +++++++++++++++++++ .../zeroconf-avahi-demos_0.2.3.bb | 10 +++ .../zeroconf-avahi-suite.inc | 11 ++++ .../zeroconf-avahi_0.2.3.bb | 8 +++ 4 files changed, 92 insertions(+) create mode 100644 recipes-ros/zeroconf-avahi-suite/files/0001-address-gcc6-build-error.patch create mode 100644 recipes-ros/zeroconf-avahi-suite/zeroconf-avahi-demos_0.2.3.bb create mode 100644 recipes-ros/zeroconf-avahi-suite/zeroconf-avahi-suite.inc create mode 100644 recipes-ros/zeroconf-avahi-suite/zeroconf-avahi_0.2.3.bb diff --git a/recipes-ros/zeroconf-avahi-suite/files/0001-address-gcc6-build-error.patch b/recipes-ros/zeroconf-avahi-suite/files/0001-address-gcc6-build-error.patch new file mode 100644 index 0000000..deb5591 --- /dev/null +++ b/recipes-ros/zeroconf-avahi-suite/files/0001-address-gcc6-build-error.patch @@ -0,0 +1,63 @@ +From aa0fce16bc80ce7a890dc63b380462f3819cf5e0 Mon Sep 17 00:00:00 2001 +From: Lukas Bulwahn +Date: Sat, 14 Jan 2017 06:42:53 +0100 +Subject: [PATCH] address gcc6 build error + +With gcc6, compiling fails with `stdlib.h: No such file or directory`, +as including '-isystem /usr/include' breaks with gcc6, cf., +https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129. + +This commit addresses this issue for this package in the same way +it was addressed in various other ROS packages. A list of related +commits and pull requests is at: + + https://github.com/ros/rosdistro/issues/12783 + +The SYSTEM attribute for the include directories was added in commit +188f8fe9 on 2012-11-10 when the packages were changed to use catkin as +build system. The exact reason for using the SYSTEM attribute cannot be +inferred from that commit. + +Signed-off-by: Lukas Bulwahn + +Upstream-Status: Accepted [https://github.com/stonier/zeroconf_avahi_suite/pull/6/commits/aa0fce16bc80ce7a890dc63b380462f3819cf5e0] + +This patch has been generated with: + `git format-patch -1 aa0fce16bc80ce7a890dc63b380462f3819cf5e0` +in the zeroconf_avahi_suite repository. + +Signed-off-by: Lukas Bulwahn +--- + zeroconf_avahi/CMakeLists.txt | 2 +- + zeroconf_avahi_demos/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/zeroconf_avahi/CMakeLists.txt b/zeroconf_avahi/CMakeLists.txt +index 7a05c7c..ec1a48a 100644 +--- a/zeroconf_avahi/CMakeLists.txt ++++ b/zeroconf_avahi/CMakeLists.txt +@@ -21,7 +21,7 @@ catkin_package( + CATKIN_DEPENDS rosconsole roscpp zeroconf_msgs + DEPENDS Boost + ) +-include_directories(SYSTEM include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDES} ${AVAHI_INCLUDE_DIR}) ++include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDES} ${AVAHI_INCLUDE_DIR}) + + ############################################################################## + # Project +diff --git a/zeroconf_avahi_demos/CMakeLists.txt b/zeroconf_avahi_demos/CMakeLists.txt +index c558870..17495a4 100644 +--- a/zeroconf_avahi_demos/CMakeLists.txt ++++ b/zeroconf_avahi_demos/CMakeLists.txt +@@ -15,7 +15,7 @@ find_package(catkin REQUIRED COMPONENTS zeroconf_avahi zeroconf_msgs) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${zeroconf_avahi_DIR}) + find_package(Avahi REQUIRED) + catkin_package() +-include_directories(SYSTEM include ${catkin_INCLUDE_DIRS} ${AVAHI_INCLUDE_DIR}) ++include_directories(include ${catkin_INCLUDE_DIRS} ${AVAHI_INCLUDE_DIR}) + + ############################################################################## + # Project +-- +2.5.5 + diff --git a/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi-demos_0.2.3.bb b/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi-demos_0.2.3.bb new file mode 100644 index 0000000..f7460e7 --- /dev/null +++ b/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi-demos_0.2.3.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Several demos and launch-tests for the avahi based zero-configuration." +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5" + +DEPENDS = "zeroconf-msgs zeroconf-avahi" + +require zeroconf-avahi-suite.inc + +RDEPENDS_${PN} = "avahi-daemon bash" diff --git a/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi-suite.inc b/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi-suite.inc new file mode 100644 index 0000000..70c0f9f --- /dev/null +++ b/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi-suite.inc @@ -0,0 +1,11 @@ +SRC_URI = "https://github.com/stonier/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz" +SRC_URI[md5sum] = "b0212776e9c4ae69800a0a4a06e0ad25" +SRC_URI[sha256sum] = "37c1a7febd79ce67cf03f6bbf69dd839ca1efe576b46f22ff6a4ca66e7f8a791" + +SRC_URI += "file://0001-address-gcc6-build-error.patch;patchdir=.." + +S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}" + +inherit catkin + +ROS_SPN = "zeroconf_avahi_suite" diff --git a/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi_0.2.3.bb b/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi_0.2.3.bb new file mode 100644 index 0000000..f823040 --- /dev/null +++ b/recipes-ros/zeroconf-avahi-suite/zeroconf-avahi_0.2.3.bb @@ -0,0 +1,8 @@ +DESCRIPTION = "Provides zeroconf services on avahi for ros systems." +SECTION = "devel" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5" + +DEPENDS = "rosconsole roscpp zeroconf-msgs avahi" + +require zeroconf-avahi-suite.inc