diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2017-02-28 09:24:16 +0100 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2017-02-28 12:26:49 +0100 |
| commit | 4be2f6509bf1c198360af74212cd49e1751b340c (patch) | |
| tree | 05db8baadd4d5a12d9d8e303693fae7b3ca1dce6 | |
| parent | dev-python/catkin_pkg: remove old (diff) | |
| download | gentoo-4be2f6509bf1c198360af74212cd49e1751b340c.tar.gz gentoo-4be2f6509bf1c198360af74212cd49e1751b340c.tar.bz2 gentoo-4be2f6509bf1c198360af74212cd49e1751b340c.zip | |
dev-util/catkin: Install package.xml twice, once in ros_packages for fast searching/crawling, once in its standard location for other tools to find it.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
| -rw-r--r-- | dev-util/catkin/catkin-0.7.6-r1.ebuild (renamed from dev-util/catkin/catkin-0.7.6.ebuild) | 0 | ||||
| -rw-r--r-- | dev-util/catkin/files/package_xml.patch | 38 |
2 files changed, 19 insertions, 19 deletions
diff --git a/dev-util/catkin/catkin-0.7.6.ebuild b/dev-util/catkin/catkin-0.7.6-r1.ebuild index 6af6a63b9649..6af6a63b9649 100644 --- a/dev-util/catkin/catkin-0.7.6.ebuild +++ b/dev-util/catkin/catkin-0.7.6-r1.ebuild diff --git a/dev-util/catkin/files/package_xml.patch b/dev-util/catkin/files/package_xml.patch index 6099f0796010..52506ee680e7 100644 --- a/dev-util/catkin/files/package_xml.patch +++ b/dev-util/catkin/files/package_xml.patch @@ -1,19 +1,19 @@ -Index: catkin-0.7.1/cmake/catkin_package.cmake +Index: catkin-0.7.6/cmake/catkin_package.cmake =================================================================== ---- catkin-0.7.1.orig/cmake/catkin_package.cmake -+++ catkin-0.7.1/cmake/catkin_package.cmake -@@ -518,6 +518,6 @@ function(_catkin_package) - - # install package.xml +--- catkin-0.7.6.orig/cmake/catkin_package.cmake ++++ catkin-0.7.6/cmake/catkin_package.cmake +@@ -527,4 +527,7 @@ function(_catkin_package) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml -- DESTINATION share/${PROJECT_NAME} -+ DESTINATION share/ros_packages/${PROJECT_NAME} + DESTINATION share/${PROJECT_NAME} ) ++ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package.xml ++ DESTINATION share/ros_packages/${PROJECT_NAME} ++ ) endfunction() -Index: catkin-0.7.1/cmake/all.cmake +Index: catkin-0.7.6/cmake/all.cmake =================================================================== ---- catkin-0.7.1.orig/cmake/all.cmake -+++ catkin-0.7.1/cmake/all.cmake +--- catkin-0.7.6.orig/cmake/all.cmake ++++ catkin-0.7.6/cmake/all.cmake @@ -156,7 +156,7 @@ foreach(filename endforeach() @@ -23,15 +23,15 @@ Index: catkin-0.7.1/cmake/all.cmake message(STATUS "catkin ${catkin_VERSION}") # ensure that no current package name is set unset(_CATKIN_CURRENT_PACKAGE) -Index: catkin-0.7.1/cmake/catkin_metapackage.cmake +Index: catkin-0.7.6/cmake/catkin_metapackage.cmake =================================================================== ---- catkin-0.7.1.orig/cmake/catkin_metapackage.cmake -+++ catkin-0.7.1/cmake/catkin_metapackage.cmake -@@ -40,6 +40,6 @@ function(catkin_metapackage) - - # install package.xml +--- catkin-0.7.6.orig/cmake/catkin_metapackage.cmake ++++ catkin-0.7.6/cmake/catkin_metapackage.cmake +@@ -42,4 +42,7 @@ function(catkin_metapackage) install(FILES ${ARG_DIRECTORY}/package.xml -- DESTINATION share/${PROJECT_NAME} -+ DESTINATION share/ros_packages/${PROJECT_NAME} + DESTINATION share/${PROJECT_NAME} ) ++ install(FILES ${ARG_DIRECTORY}/package.xml ++ DESTINATION share/ros_packages/${PROJECT_NAME} ++ ) endfunction() |