[ros-geometry-experimental] 01/01: Add patch to remove RPATH in tf2_py
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Thu Dec 24 14:31:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to branch master
in repository ros-geometry-experimental.
commit 21e2289bce22ac5a38ac4e94a5c34b5b6d9486b1
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Thu Dec 24 15:31:02 2015 +0100
Add patch to remove RPATH in tf2_py
---
...PATH-on-tf2_py-Python-library-Debian-spec.patch | 23 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 24 insertions(+)
diff --git a/debian/patches/0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch b/debian/patches/0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch
new file mode 100644
index 0000000..2a94a04
--- /dev/null
+++ b/debian/patches/0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch
@@ -0,0 +1,23 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Thu, 24 Dec 2015 14:32:15 +0100
+Subject: Don't set RPATH on tf2_py Python library (Debian specific)
+
+Somehow cmake loses the tf2_py file when removing RPATHs upon
+installation. We assume that files are installed into their default
+location and don't need an RPATH accordingly.
+---
+ tf2_py/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tf2_py/CMakeLists.txt b/tf2_py/CMakeLists.txt
+index fd70b0e..7e61ba0 100644
+--- a/tf2_py/CMakeLists.txt
++++ b/tf2_py/CMakeLists.txt
+@@ -99,6 +99,7 @@ set_target_properties(tf2_py PROPERTIES COMPILE_FLAGS "-g -Wno-missing-field-ini
+ set_target_properties(tf2_py PROPERTIES
+ ARCHIVE_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_PYTHON_DESTINATION}
+ LIBRARY_OUTPUT_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_PYTHON_DESTINATION}
++ SKIP_BUILD_RPATH TRUE
+ )
+ #!! rosbuild_add_compile_flags(tf2_py ${SSE_FLAGS}) #conditionally adds sse flags if available
+
diff --git a/debian/patches/series b/debian/patches/series
index 0e1cfd5..c4cd179 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
0002-Add-Debian-specific-SONAME.patch
0003-Remove-old-load_manifest-from-view_frames.patch
0004-Don-t-export-catkin-includes-into-tf2-Config.cmake.patch
+0005-Don-t-set-RPATH-on-tf2_py-Python-library-Debian-spec.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-geometry-experimental.git
More information about the debian-science-commits
mailing list