From b3dd62ca3758dde7717cb8ccf53ac6c9bad73ced Mon Sep 17 00:00:00 2001 From: Kristof Robot Date: Tue, 12 Nov 2013 20:50:37 +0100 Subject: [PATCH 1/3] kdl: initial commit orocos-kdl: moving source info into kdl.inc to share with python-orocos-kdl recipe --- recipes-extended/kdl/kdl.inc | 9 +++++++++ .../{orocos-kdl => kdl}/orocos-kdl_1.1.102-1.bb | 8 +------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 recipes-extended/kdl/kdl.inc rename recipes-extended/{orocos-kdl => kdl}/orocos-kdl_1.1.102-1.bb (77%) diff --git a/recipes-extended/kdl/kdl.inc b/recipes-extended/kdl/kdl.inc new file mode 100644 index 0000000..61a1daa --- /dev/null +++ b/recipes-extended/kdl/kdl.inc @@ -0,0 +1,9 @@ +SRC_URI = "git://github.com/orocos/orocos_kinematics_dynamics.git" +SRCREV = "15fb082c10b58078841c14c067ac55f592733447" +PV = "1.1.102+git${SRCREV}" + +S = "${WORKDIR}/git/${@d.getVar('BPN', True).replace('-', '_')}" + +inherit cmake + +ROS_SPN = "kdl" diff --git a/recipes-extended/orocos-kdl/orocos-kdl_1.1.102-1.bb b/recipes-extended/kdl/orocos-kdl_1.1.102-1.bb similarity index 77% rename from recipes-extended/orocos-kdl/orocos-kdl_1.1.102-1.bb rename to recipes-extended/kdl/orocos-kdl_1.1.102-1.bb index 292e685..e657b66 100644 --- a/recipes-extended/orocos-kdl/orocos-kdl_1.1.102-1.bb +++ b/recipes-extended/kdl/orocos-kdl_1.1.102-1.bb @@ -3,13 +3,7 @@ SECTION = "devel" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a8ffd58e6eb29a955738b8fcc9e9e8f2" -SRC_URI = "git://github.com/orocos/orocos_kinematics_dynamics.git" -SRCREV = "15fb082c10b58078841c14c067ac55f592733447" -PV = "1.1.102+git${SRCREV}" - -S = "${WORKDIR}/git/orocos_kdl" - -inherit cmake +require kdl.inc FILES_${PN}-dev += "/usr/share/orocos_kdl/package.xml /usr/share/orocos_kdl/orocos_kdl-config.cmake" From b3b478c412e404e9b6b62ec9a086cb0910285cde Mon Sep 17 00:00:00 2001 From: Kristof Robot Date: Tue, 12 Nov 2013 20:54:56 +0100 Subject: [PATCH 2/3] orocos-kdl: added libeigen DEPENDS and cleaned FILES section --- recipes-extended/kdl/orocos-kdl_1.1.102-1.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/recipes-extended/kdl/orocos-kdl_1.1.102-1.bb b/recipes-extended/kdl/orocos-kdl_1.1.102-1.bb index e657b66..5051c08 100644 --- a/recipes-extended/kdl/orocos-kdl_1.1.102-1.bb +++ b/recipes-extended/kdl/orocos-kdl_1.1.102-1.bb @@ -3,12 +3,14 @@ SECTION = "devel" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a8ffd58e6eb29a955738b8fcc9e9e8f2" -require kdl.inc +DEPENDS = "libeigen" -FILES_${PN}-dev += "/usr/share/orocos_kdl/package.xml /usr/share/orocos_kdl/orocos_kdl-config.cmake" +require kdl.inc do_install_append() { # remove sysroot library path from pkgconfig files sed -i -e 's#${STAGING_INCDIR}#${includedir}#g' \ ${D}${libdir}/pkgconfig/*.pc } + +FILES_${PN}-dev += "${datadir}/orocos_kdl/*" From b4a902e80110e11d51ac28b2d93baecc30304403 Mon Sep 17 00:00:00 2001 From: Kristof Robot Date: Tue, 12 Nov 2013 20:51:51 +0100 Subject: [PATCH 3/3] python-orocos-kdl: initial commit (resolves #203) --- .../python-orocos-kdl/0001-findSIP-fix.patch | 34 +++++++++++++++++++ .../kdl/python-orocos-kdl_1.1.102-1.bb | 18 ++++++++++ 2 files changed, 52 insertions(+) create mode 100644 recipes-extended/kdl/python-orocos-kdl/0001-findSIP-fix.patch create mode 100644 recipes-extended/kdl/python-orocos-kdl_1.1.102-1.bb diff --git a/recipes-extended/kdl/python-orocos-kdl/0001-findSIP-fix.patch b/recipes-extended/kdl/python-orocos-kdl/0001-findSIP-fix.patch new file mode 100644 index 0000000..a99f73b --- /dev/null +++ b/recipes-extended/kdl/python-orocos-kdl/0001-findSIP-fix.patch @@ -0,0 +1,34 @@ +diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake +index 53e2888..8f94cf5 100644 +--- a/cmake/FindSIP.cmake ++++ b/cmake/FindSIP.cmake +@@ -31,17 +31,26 @@ IF(SIP_VERSION) + SET(SIP_FOUND TRUE) + ELSE(SIP_VERSION) + +- FIND_FILE(_find_sip_py FindSIP.py PATHS ${CMAKE_MODULE_PATH}) ++ FIND_FILE(_find_sip_py FindSIP.py PATHS ${CMAKE_MODULE_PATH} NO_CMAKE_FIND_ROOT_PATH) + + EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE sip_config) + IF(sip_config) + STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config}) + STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config}) +- STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_EXECUTABLE ${sip_config}) + IF(NOT SIP_DEFAULT_SIP_DIR) + STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) + ENDIF(NOT SIP_DEFAULT_SIP_DIR) +- STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) ++ ++ IF(CMAKE_CROSSCOMPILING) ++ FIND_PROGRAM(SIP_EXECUTABLE sip) ++ STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) ++ LIST(GET CMAKE_FIND_ROOT_PATH 0 SIP_SYSROOT) ++ SET(SIP_INCLUDE_DIR "${SIP_SYSROOT}${SIP_INCLUDE_DIR}") ++ ELSE(CMAKE_CROSSCOMPILING) ++ STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_EXECUTABLE ${sip_config}) ++ STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) ++ ENDIF(CMAKE_CROSSCOMPILING) ++ + SET(SIP_FOUND TRUE) + ENDIF(sip_config) + diff --git a/recipes-extended/kdl/python-orocos-kdl_1.1.102-1.bb b/recipes-extended/kdl/python-orocos-kdl_1.1.102-1.bb new file mode 100644 index 0000000..4083a44 --- /dev/null +++ b/recipes-extended/kdl/python-orocos-kdl_1.1.102-1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "This package contains the python bindings PyKDL for the Kinematics and Dynamics Library (KDL), distributed by the Orocos Project." +SECTION = "devel" +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=46ee8693f40a89a31023e97ae17ecf19" + +DEPENDS = "sip-native python-sip orocos-kdl" + +require kdl.inc + +SRC_URI += "file://0001-findSIP-fix.patch" + +inherit pythonnative + +FILES_${PN} += "${libdir}/python*/dist-packages/PyKDL.so" +FILES_${PN}-dev += "${datadir}/python_orocos_kdl/*" +FILES_${PN}-dbg += "${libdir}/python*/dist-packages/.debug/*" + +RDEPENDS_{PN} = "python-sip"