From a798ac322682b9b7e7b495ff86cc30718636f82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lisandro=20Dami=C3=A1n=20Nicanor=20P=C3=A9rez=20Meyer?= Date: Sun, 23 Jul 2023 17:54:01 -0300 Subject: [PATCH] Avoid setting RPATH/RUNPATH on examples' binaries. --- debian/changelog | 4 ++++ .../patches/remove_rpath_from_examples.patch | 22 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 27 insertions(+) create mode 100644 debian/patches/remove_rpath_from_examples.patch diff --git a/debian/changelog b/debian/changelog index 70a505b..acf3baf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ qt6-base (6.4.2+dfsg-17) UNRELEASED; urgency=medium + [ Lisandro Damián Nicanor Pérez Meyer ] + * Add remove_rpath_from_examples.patch in order to avoid setting + RPATH/RUNPATH on examples' binaries. + -- Debian Qt/KDE Maintainers Sun, 23 Jul 2023 17:49:16 -0300 qt6-base (6.4.2+dfsg-16) unstable; urgency=medium diff --git a/debian/patches/remove_rpath_from_examples.patch b/debian/patches/remove_rpath_from_examples.patch new file mode 100644 index 0000000..07f01d5 --- /dev/null +++ b/debian/patches/remove_rpath_from_examples.patch @@ -0,0 +1,22 @@ +Description: remove RPATH/RUNPATH from examples' binaries. + On Debian the examples are built against system's libraries, so there is no + need to set RPATH/RUNPATH. +Author: Lisandro Damián Nicanor Pérez Meyer +Forwarded: not-needed +Last-Update: 2023-07-23 + +--- + cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake ++++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +@@ -849,7 +849,7 @@ macro(qt_examples_build_begin) + # This means that installed examples are not relocatable at the moment. We would need to + # annotate where each example is installed to, to be able to derive a relative rpath, and it + # seems there's no way to query such information from CMake itself. +- set(CMAKE_INSTALL_RPATH "${_default_install_rpath}") ++ #set(CMAKE_INSTALL_RPATH "${_default_install_rpath}") + set(QT_DISABLE_QT_ADD_PLUGIN_COMPATIBILITY TRUE) + + install(CODE " diff --git a/debian/patches/series b/debian/patches/series index 888c314..7ade58b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,6 +19,7 @@ build_path_embedded_qtbuildinternalsextra_cmake.patch cross.patch force_shared_libzstd.patch no_htmlinfo_example.patch +remove_rpath_from_examples.patch # Don't use yield on CPUs that might not support it armel-noyield.patch