diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-04-15 13:30:25 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-04-15 18:13:56 +0200 |
| commit | d29843466abcd3e3a6e638c7c2b3511b82f70646 (patch) | |
| tree | bdd56ff6a8840e51e1889fa2747fce2bf287ae1a /gnu/packages/qt.scm | |
| parent | 6c0dfb195c1ff65a60ab6f0e297fd37ea3d4c841 (diff) | |
| download | patches-d29843466abcd3e3a6e638c7c2b3511b82f70646.tar patches-d29843466abcd3e3a6e638c7c2b3511b82f70646.tar.gz | |
gnu: qt-4: Do not set $LDFLAGS since that triggerred a build failure.
Fixes the build failure at <http://hydra.gnu.org/build/379884/log/raw>:
g++ -licui18n -Wl,-O1 [...] -o ../../../../bin/assistant [...]
ld: warning: libQtCLucene.so.4, needed by /tmp/nix-build-qt-4.8.6.drv-0/qt-everywhere-opensource-src-4.8.6/lib/libQtHelp.so, not found (try using -rpath or -rpath-link)
/tmp/nix-build-qt-4.8.6.drv-0/qt-everywhere-opensource-src-4.8.6/lib/libQtHelp.so: undefined reference to `QCLucenePhraseQuery::getTerms() const'
[...]
* gnu/packages/patches/qt4-ldflags.patch: New file.
* gnu-system.am (dist_patch_DATA): Add it.
* gnu/packages/qt.scm (qt-4)[source]: Use it.
[arguments]: Remove 'setenv' call in 'configure' phase.
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 911de16024..1787059f51 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -230,7 +230,8 @@ developers using C++ or QML, a CSS & JavaScript like language.") (sha256 (base32 "0b036iqgmbbv37dgwwfihw3mihjbnw3kb5kaisdy0qi8nn8xs54b")) - (patches (list (search-patch "qt4-tests.patch"))))) + (patches (map search-patch + '("qt4-ldflags.patch" "qt4-tests.patch"))))) (inputs `(,@(alist-delete "libjpeg" (package-inputs qt)) ("libjepg" ,libjpeg-8) ("libsm" ,libsm))) @@ -241,15 +242,8 @@ developers using C++ or QML, a CSS & JavaScript like language.") (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) (substitute* '("configure") - (("/bin/pwd") (which "pwd"))) - ;; Explicitly link with icui18n, which is dlopened by - ;; QtCore.so. The LDFLAGS are in fact added to other flags - ;; determined by the configure phase. - ;; According to the nix recipe, this may be necessary for - ;; further libraries (cups, gtk-x11-2.0, libgdk-x11-2.0). - (setenv "LDFLAGS" "-licui18n") - ;; do not pass "--enable-fast-install", which makes the - ;; configure process fail + (("/bin/pwd") (which "pwd"))) + (zero? (system* "./configure" "-verbose" |