genpy: updating to 0.4.14
The genpy recipe was updated to 0.4.14 to be in line with
4551e7c32d/hydro/release.yaml
.
The previously applied patch has been included in 0.4.14 and is
removed from the recipe and this repository.
The PR variable is reset.
This commit is contained in:
parent
8f4d4ad2a6
commit
bd5265bb2f
|
@ -1,30 +0,0 @@
|
|||
From 1bc78ac23e465c1b3ef040d11c53d89cdc00b8ae Mon Sep 17 00:00:00 2001
|
||||
From: Dirk Thomas <dthomas@osrfoundation.org>
|
||||
Date: Fri, 26 Jul 2013 13:34:18 -0700
|
||||
Subject: [PATCH] resolve genpy path in installspace at runtime
|
||||
(ros/catkin#490)
|
||||
|
||||
---
|
||||
cmake/genpy-extras.cmake.em | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/cmake/genpy-extras.cmake.em b/cmake/genpy-extras.cmake.em
|
||||
index fd78a97..5a57285 100644
|
||||
--- a/cmake/genpy-extras.cmake.em
|
||||
+++ b/cmake/genpy-extras.cmake.em
|
||||
@@ -1,9 +1,9 @@
|
||||
@[if DEVELSPACE]@
|
||||
-# bin dir variables in develspace
|
||||
+# location of scripts in develspace
|
||||
set(GENPY_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
|
||||
@[else]@
|
||||
-# bin dir variables in installspace
|
||||
-set(GENPY_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)")
|
||||
+# location of scripts in installspace
|
||||
+set(GENPY_BIN_DIR "${genpy_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)")
|
||||
@[end if]@
|
||||
|
||||
set(GENMSG_PY_BIN ${GENPY_BIN_DIR}/genmsg_py.py)
|
||||
--
|
||||
1.8.1.6
|
||||
|
|
@ -5,13 +5,9 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
|
|||
|
||||
DEPENDS = "genmsg-native"
|
||||
|
||||
PR = "r3"
|
||||
|
||||
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
||||
SRC_URI[md5sum] = "201e3f1aa5e12ccc09159b1a3d9272f7"
|
||||
SRC_URI[sha256sum] = "9dae768e9350c835ae8a40f19d230e3fe023bfc1e259a14be8b3ae7c4c632d3c"
|
||||
|
||||
SRC_URI += "file://0001-resolve-genpy-path-in-installspace-at-runtime.patch"
|
||||
SRC_URI[md5sum] = "4e84c43d90f6bf5c4ed72f8a586db00a"
|
||||
SRC_URI[sha256sum] = "6e39040dc02b032ba85c2f9500ee9f57a462cbbcdee45eebcc98c0ffbf04d731"
|
||||
|
||||
inherit catkin
|
||||
|
Loading…
Reference in New Issue