diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2020-10-13 13:17:26 +0200 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2020-10-13 13:24:20 +0200 |
| commit | 3efdb8ce7f118d456cd864fb40aa43794f8deb76 (patch) | |
| tree | 715bcb084531f8fddfc41a0b78c503c1434ced65 /dev-ros | |
| parent | dev-ros/qt_gui_cpp: Remove old (diff) | |
| download | gentoo-3efdb8ce7f118d456cd864fb40aa43794f8deb76.tar.gz gentoo-3efdb8ce7f118d456cd864fb40aa43794f8deb76.tar.bz2 gentoo-3efdb8ce7f118d456cd864fb40aa43794f8deb76.zip | |
dev-ros/qt_gui_cpp: fix rpath leak
Closes: https://bugs.gentoo.org/741050
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
Diffstat (limited to 'dev-ros')
| -rw-r--r-- | dev-ros/qt_gui_cpp/files/rpaths.patch | 13 | ||||
| -rw-r--r-- | dev-ros/qt_gui_cpp/qt_gui_cpp-0.4.2.ebuild | 1 | ||||
| -rw-r--r-- | dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild | 1 |
3 files changed, 15 insertions, 0 deletions
diff --git a/dev-ros/qt_gui_cpp/files/rpaths.patch b/dev-ros/qt_gui_cpp/files/rpaths.patch new file mode 100644 index 000000000000..7f95b9e938a9 --- /dev/null +++ b/dev-ros/qt_gui_cpp/files/rpaths.patch @@ -0,0 +1,13 @@ +Index: qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt +=================================================================== +--- qt_gui_cpp.orig/src/qt_gui_cpp_sip/CMakeLists.txt ++++ qt_gui_cpp/src/qt_gui_cpp_sip/CMakeLists.txt +@@ -29,7 +29,7 @@ set(qt_gui_cpp_sip_DEPENDENT_FILES + # maintain context for different named target + set(qt_gui_cpp_sip_INCLUDE_DIRS ${qt_gui_cpp_INCLUDE_DIRS} "${CMAKE_CURRENT_SOURCE_DIR}/../../include" ${catkin_INCLUDE_DIRS}) + set(qt_gui_cpp_sip_LIBRARIES ${qt_gui_cpp_LIBRARIES} ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES}) +-set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS} ${CATKIN_DEVEL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) ++set(qt_gui_cpp_sip_LIBRARY_DIRS ${qt_gui_cpp_LIBRARY_DIRS}) + set(qt_gui_cpp_sip_LDFLAGS_OTHER ${qt_gui_cpp_LDFLAGS_OTHER}) + + find_package(python_qt_binding REQUIRED) 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 index 1f52f6afc836..dac9e5563d61 100644 --- 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 @@ -30,6 +30,7 @@ DEPEND="${RDEPEND} " PATCHES=( "${FILESDIR}/libdir.patch" + "${FILESDIR}/rpaths.patch" ) # FIXME: fails to build with ninja diff --git a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild index 1f52f6afc836..dac9e5563d61 100644 --- a/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild +++ b/dev-ros/qt_gui_cpp/qt_gui_cpp-9999.ebuild @@ -30,6 +30,7 @@ DEPEND="${RDEPEND} " PATCHES=( "${FILESDIR}/libdir.patch" + "${FILESDIR}/rpaths.patch" ) # FIXME: fails to build with ninja |