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-system.am | |
| parent | 6c0dfb195c1ff65a60ab6f0e297fd37ea3d4c841 (diff) | |
| download | guix-patches-d29843466abcd3e3a6e638c7c2b3511b82f70646.tar guix-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-system.am')
| -rw-r--r-- | gnu-system.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/gnu-system.am b/gnu-system.am index 1d3496f81f..d92aaaf891 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -520,6 +520,7 @@ dist_patch_DATA = \ gnu/packages/patches/python2-rdflib-drop-sparqlwrapper.patch \ gnu/packages/patches/python2-sqlite-3.8.4-test-fix.patch \ gnu/packages/patches/python2-pygobject-2-gi-info-type-error-domain.patch \ + gnu/packages/patches/qt4-ldflags.patch \ gnu/packages/patches/qt4-tests.patch \ gnu/packages/patches/qt5-runpath.patch \ gnu/packages/patches/ratpoison-shell.patch \ |