| 1 |
commit: 5b240aa12260678c766f1f7cc19ec7e405ff4440 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 2 12:00:40 2015 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 2 12:00:47 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b240aa1 |
| 7 |
|
| 8 |
dev-ros/xmlrpcpp: Install headers in a prefixed directory. |
| 9 |
|
| 10 |
Fixes collisions with heimdal, bug #561208. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.23 |
| 13 |
|
| 14 |
dev-ros/xmlrpcpp/files/headers.patch | 15 +++++++++++++++ |
| 15 |
...xmlrpcpp-1.11.15.ebuild => xmlrpcpp-1.11.15-r1.ebuild} | 8 ++++++++ |
| 16 |
dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild | 8 ++++++++ |
| 17 |
3 files changed, 31 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-ros/xmlrpcpp/files/headers.patch b/dev-ros/xmlrpcpp/files/headers.patch |
| 20 |
new file mode 100644 |
| 21 |
index 0000000..ed0cea6 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-ros/xmlrpcpp/files/headers.patch |
| 24 |
@@ -0,0 +1,15 @@ |
| 25 |
+Index: ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt |
| 26 |
+=================================================================== |
| 27 |
+--- ros_comm-1.11.15.orig/utilities/xmlrpcpp/CMakeLists.txt |
| 28 |
++++ ros_comm-1.11.15/utilities/xmlrpcpp/CMakeLists.txt |
| 29 |
+@@ -30,9 +30,8 @@ if(WIN32) |
| 30 |
+ target_link_libraries(xmlrpcpp ws2_32) |
| 31 |
+ endif() |
| 32 |
+ |
| 33 |
+-# FIXME the headers should be in a package-specific subfolder but can not be for backward compatibility |
| 34 |
+ install(DIRECTORY include/ |
| 35 |
+- DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION} |
| 36 |
++ DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION} |
| 37 |
+ FILES_MATCHING PATTERN "*.h") |
| 38 |
+ |
| 39 |
+ install(TARGETS xmlrpcpp |
| 40 |
|
| 41 |
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild |
| 42 |
similarity index 54% |
| 43 |
rename from dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild |
| 44 |
rename to dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild |
| 45 |
index a0ae0fd..b4772f1 100644 |
| 46 |
--- a/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15.ebuild |
| 47 |
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.11.15-r1.ebuild |
| 48 |
@@ -17,3 +17,11 @@ IUSE="" |
| 49 |
|
| 50 |
RDEPEND="dev-ros/cpp_common" |
| 51 |
DEPEND="${RDEPEND}" |
| 52 |
+PATCHES=( "${FILESDIR}/headers.patch" ) |
| 53 |
+ |
| 54 |
+src_configure() { |
| 55 |
+ ros-catkin_src_configure |
| 56 |
+ # Hack so that proper -I are added |
| 57 |
+ sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \ |
| 58 |
+ -i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die |
| 59 |
+} |
| 60 |
|
| 61 |
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild |
| 62 |
index a0ae0fd..b4772f1 100644 |
| 63 |
--- a/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild |
| 64 |
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-9999.ebuild |
| 65 |
@@ -17,3 +17,11 @@ IUSE="" |
| 66 |
|
| 67 |
RDEPEND="dev-ros/cpp_common" |
| 68 |
DEPEND="${RDEPEND}" |
| 69 |
+PATCHES=( "${FILESDIR}/headers.patch" ) |
| 70 |
+ |
| 71 |
+src_configure() { |
| 72 |
+ ros-catkin_src_configure |
| 73 |
+ # Hack so that proper -I are added |
| 74 |
+ sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${SYSROOT:-${EPREFIX}}/usr/include/xmlrpcpp\"#" \ |
| 75 |
+ -i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die |
| 76 |
+} |
Archives