Avoid setting RPATH/RUNPATH on examples' binaries.
This commit is contained in:
parent
d7e581cadd
commit
a798ac3226
4
debian/changelog
vendored
4
debian/changelog
vendored
@ -1,5 +1,9 @@
|
|||||||
qt6-base (6.4.2+dfsg-17) UNRELEASED; urgency=medium
|
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 <debian-qt-kde@lists.debian.org> Sun, 23 Jul 2023 17:49:16 -0300
|
-- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> Sun, 23 Jul 2023 17:49:16 -0300
|
||||||
|
|
||||||
qt6-base (6.4.2+dfsg-16) unstable; urgency=medium
|
qt6-base (6.4.2+dfsg-16) unstable; urgency=medium
|
||||||
|
22
debian/patches/remove_rpath_from_examples.patch
vendored
Normal file
22
debian/patches/remove_rpath_from_examples.patch
vendored
Normal file
@ -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 <lisandro@debian.org>
|
||||||
|
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 "
|
1
debian/patches/series
vendored
1
debian/patches/series
vendored
@ -19,6 +19,7 @@ build_path_embedded_qtbuildinternalsextra_cmake.patch
|
|||||||
cross.patch
|
cross.patch
|
||||||
force_shared_libzstd.patch
|
force_shared_libzstd.patch
|
||||||
no_htmlinfo_example.patch
|
no_htmlinfo_example.patch
|
||||||
|
remove_rpath_from_examples.patch
|
||||||
|
|
||||||
# Don't use yield on CPUs that might not support it
|
# Don't use yield on CPUs that might not support it
|
||||||
armel-noyield.patch
|
armel-noyield.patch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user