| 1 |
commit: 3efdb8ce7f118d456cd864fb40aa43794f8deb76 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 13 11:17:26 2020 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 13 11:24:20 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3efdb8ce |
| 7 |
|
| 8 |
dev-ros/qt_gui_cpp: fix rpath leak |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/741050 |
| 11 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 12 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 13 |
|
| 14 |
dev-ros/qt_gui_cpp/files/rpaths.patch | 13 +++++++++++++ |
| 15 |
dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild | 1 + |
| 16 |
dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild | 1 + |
| 17 |
3 files changed, 15 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-ros/qt_gui_cpp/files/rpaths.patch b/dev-ros/qt_gui_cpp/files/rpaths.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..7f95b9e938a |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-ros/qt_gui_cpp/files/rpaths.patch |
| 24 |
@@ -0,0 +1,13 @@ |
| 25 |
+Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt |
| 26 |
+=================================================================== |
| 27 |
+--- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt |
| 28 |
++++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt |
| 29 |
+@@ -29,7 +29,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES |
| 30 |
+ # maintain context for different named target |
| 31 |
+ set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS}) |
| 32 |
+ set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES}) |
| 33 |
+-set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) |
| 34 |
++set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS}) |
| 35 |
+ set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER}) |
| 36 |
+ |
| 37 |
+ find_package(python_qt_binding REQUIRED) |
| 38 |
|
| 39 |
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild |
| 40 |
index 1f52f6afc83..dac9e5563d6 100644 |
| 41 |
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild |
| 42 |
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild |
| 43 |
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND} |
| 44 |
" |
| 45 |
PATCHES=( |
| 46 |
"${FILESDIR}/libdir.patch" |
| 47 |
+ "${FILESDIR}/rpaths.patch" |
| 48 |
) |
| 49 |
|
| 50 |
# FIXME: fails to build with ninja |
| 51 |
|
| 52 |
diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild |
| 53 |
index 1f52f6afc83..dac9e5563d6 100644 |
| 54 |
--- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild |
| 55 |
+++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild |
| 56 |
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND} |
| 57 |
" |
| 58 |
PATCHES=( |
| 59 |
"${FILESDIR}/libdir.patch" |
| 60 |
+ "${FILESDIR}/rpaths.patch" |
| 61 |
) |
| 62 |
|
| 63 |
# FIXME: fails to build with ninja |
Archives