summaryrefslogtreecommitdiffstats
path: root/ubuntu/raring/dependencies/tqt3/debian/patches/06_disable_rpath.diff
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/raring/dependencies/tqt3/debian/patches/06_disable_rpath.diff')
-rw-r--r--ubuntu/raring/dependencies/tqt3/debian/patches/06_disable_rpath.diff12
1 files changed, 8 insertions, 4 deletions
diff --git a/ubuntu/raring/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/ubuntu/raring/dependencies/tqt3/debian/patches/06_disable_rpath.diff
index 27fc1426c..a3d74ffce 100644
--- a/ubuntu/raring/dependencies/tqt3/debian/patches/06_disable_rpath.diff
+++ b/ubuntu/raring/dependencies/tqt3/debian/patches/06_disable_rpath.diff
@@ -2,25 +2,29 @@ author: Martin Loschwitz <[email protected]>
Disables the rpath settings in qmake.conf
+Index: b/mkspecs/linux-g++/qmake.conf
+===================================================================
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
-@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared
+@@ -55,7 +55,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath,
+QMAKE_RPATH =
- QMAKE_LIBS =
+ QMAKE_LIBS = -luuid
QMAKE_LIBS_DYNLOAD = -ldl
+Index: b/mkspecs/linux-g++-64/qmake.conf
+===================================================================
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
-@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared
+@@ -58,7 +58,7 @@
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
QMAKE_LFLAGS_SONAME = -Wl,-soname,
QMAKE_LFLAGS_THREAD =
-QMAKE_RPATH = -Wl,-rpath,
+QMAKE_RPATH =
- QMAKE_LIBS =
+ QMAKE_LIBS = -luuid
QMAKE_LIBS_DYNLOAD = -ldl