p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

we patch catkin as catkin assumes that every linux is an ubuntu system but the openembedded linux system is not

This commit is contained in:
Lukas Bulwahn 2013-01-11 09:43:56 +01:00
parent 69c02888bf
commit e7a336b151
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
recipes-ros/catkin/catkin/catkin-change_default_for_debsetuptools.patch Normal file
View File

@ -0,0 +1,20 @@
diff -cr a/cmake/python.cmake b/cmake/python.cmake
*** a/cmake/python.cmake 2012-12-22 03:30:48.000000000 +0100
--- b/cmake/python.cmake 2013-01-11 09:25:35.790346760 +0100
***************
*** 6,12 ****
set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY} CACHE STRING "Python version")
#This should be resolved automatically one day...
! option(SETUPTOOLS_DEB_LAYOUT "ON for debian style python packages layout" ON)
if(APPLE OR MSVC)
set(SETUPTOOLS_DEB_LAYOUT OFF)
--- 6,12 ----
set(PYTHON_VERSION_XDOTY ${PYTHON_VERSION_XDOTY} CACHE STRING "Python version")
#This should be resolved automatically one day...
! option(SETUPTOOLS_DEB_LAYOUT "ON for debian style python packages layout" OFF)
if(APPLE OR MSVC)
set(SETUPTOOLS_DEB_LAYOUT OFF)

3
recipes-ros/catkin/catkin_0.5.58.bb
View File

@ -3,7 +3,8 @@ SECTION = "devel"
# TODO: License of catkin unmentioned in the repository
LICENSE = "CLOSED"
SRC_URI = "https://github.com/ros/catkin/archive/0.5.58.tar.gz"
SRC_URI = "https://github.com/ros/catkin/archive/0.5.58.tar.gz \
file://catkin-change_default_for_debsetuptools.patch"
SRC_URI[md5sum] = "e4df85e60dc792af9324334547cc76aa"
SRC_URI[sha256sum] = "dd99cc04eeaf16a13185dd0a2f576939fa997dfb16a40ba45068c4d2ebbcb44b"