diff options
| author | Pino Toscano <pino@debian.org> | 2013-04-21 19:46:02 +0200 |
|---|---|---|
| committer | Pino Toscano <pino@debian.org> | 2013-04-21 19:46:02 +0200 |
| commit | a5a54433ccb60024962e35f21d8fb2464614d144 (patch) | |
| tree | e10aad9e96fc079ed5d202671abe8c0cf3118908 | |
| parent | 585b744f99718e7181d17fdc6eb0ae0cc546c700 (diff) | |
| download | qtbase-a5a54433ccb60024962e35f21d8fb2464614d144.tar.gz | |
use LD_LIBRARY_PATH on any GNU system
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/deppath_gnu.diff | 18 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c3396c5..f225275 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ qtbase-opensource-src (5.0.2+dfsg1-3) UNRELEASED; urgency=low dlopen'ed). * Move the private qsqlresult_p.h from qtbase5-dev to qtbase5-private-dev, adding proper breaks/replaces in the latter. + * Use LD_LIBRARY_PATH on any GNU system; patch deppath_gnu.diff. [ Lisandro Damián Nicanor Pérez Meyer ] * Update symbols files for hurd-i386, i386, ia64 and powerpc. diff --git a/debian/patches/deppath_gnu.diff b/debian/patches/deppath_gnu.diff new file mode 100644 index 0000000..f8fa9f3 --- /dev/null +++ b/debian/patches/deppath_gnu.diff @@ -0,0 +1,18 @@ +Author: Pino Toscano <toscano.pino@tiscali.it> +Description: Use LD_LIBRARY_PATH for deppath.name in any GNU system + Use the right environment variable for deppath.name in any system based on + GNU libc. +Last-Update: 2013-04-21 +Forwarded: no + +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -242,7 +242,7 @@ defineTest(qtAddTargetEnv) { + deppath += $$shell_path($$eval(QT.$${dep}.libs)) + equals(QMAKE_HOST.os, Windows) { + deppath.name = PATH +- } else:contains(QMAKE_HOST.os, Linux|FreeBSD) { ++ } else:contains(QMAKE_HOST.os, Linux|FreeBSD|GNU) { + deppath.name = LD_LIBRARY_PATH + } else:equals(QMAKE_HOST.os, Darwin) { + contains(QT_CONFIG, qt_framework): \ diff --git a/debian/patches/series b/debian/patches/series index b2035ba..0b1eef3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ undef_B0.diff +deppath_gnu.diff # Debian specific. build_examples.patch |