3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
guix/gnu/packages/patches/qtbase-absolute-runpath.patch
Marius Bakke dec0217f6e
gnu: python-shiboken-2, python-pyside-2: Update to 5.14.2.3.
* gnu/packages/patches/qtbase-absolute-runpath.patch: New file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/qt.scm (qtbase/next): New variable.
* gnu/packages/qt.scm (python-shiboken-2): Update to 5.14.2.3.
[source](uri): Adjust for tarball rename.
[inputs]: Use the default CLANG-TOOLCHAIN.
(python-pyside-2)[inputs]: Likewise.
(python-pyside-2-tools)[inputs]: Change from QTBASE to QTBASE/NEXT.
2020-07-15 20:08:10 +02:00

17 lines
611 B
Diff

Do not use $ORIGIN in RUNPATH so that executables can be copied elsewhere and
still be expected to work (needed for python-pyside-2-tools).
diff --git a/mkspecs/common/linux.conf b/mkspecs/common/linux.conf
--- a/mkspecs/common/linux.conf
+++ b/mkspecs/common/linux.conf
@@ -10,8 +10,8 @@ QMAKE_CFLAGS_THREAD += -D_REENTRANT
QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
-QMAKE_LFLAGS_REL_RPATH = -Wl,-z,origin
-QMAKE_REL_RPATH_BASE = $ORIGIN
+QMAKE_LFLAGS_REL_RPATH =
+QMAKE_REL_RPATH_BASE =
QMAKE_INCDIR =
QMAKE_LIBDIR =