diff options
| author | albator <albator@arcadia.vtf> | 2011-11-07 19:57:39 +0100 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-11-07 19:57:39 +0100 |
| commit | 03dfe5d102e7ea66edb72faefc170da82c76d707 (patch) | |
| tree | baa77d05b4a8e628b196326c774034f2727793e9 /ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff | |
| parent | d06710500298b4e024a384f3bdba5e0f657f38bc (diff) | |
| parent | aa9c1d39fa05dac2c1bf569ac6828dbcd525f481 (diff) | |
| download | tde-packaging-03dfe5d102e7ea66edb72faefc170da82c76d707.tar.gz tde-packaging-03dfe5d102e7ea66edb72faefc170da82c76d707.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff')
| -rw-r--r-- | ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff new file mode 100644 index 000000000..27fc1426c --- /dev/null +++ b/ubuntu/maverick/dependencies/tqt3/debian/patches/06_disable_rpath.diff @@ -0,0 +1,26 @@ +author: Martin Loschwitz <madkiss@madkiss.org> + +Disables the rpath settings in qmake.conf + +--- a/mkspecs/linux-g++/qmake.conf ++++ b/mkspecs/linux-g++/qmake.conf +@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +--- a/mkspecs/linux-g++-64/qmake.conf ++++ b/mkspecs/linux-g++-64/qmake.conf +@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl |