diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-20 23:51:26 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-20 23:51:26 +0100 |
| commit | edae5b3d50692c25e29fe65fdc14ae3ccdce884d (patch) | |
| tree | ec257af3a922fd96bda8b8b16c00c8d0beaf445a /gnu/packages/qt.scm | |
| parent | 1dba64079c5aaa1fb40e4b1d989f1f06efd6cb63 (diff) | |
| parent | e3aaefe71bd26daf6fdbfd0634f68a90985e059b (diff) | |
| download | guix-edae5b3d50692c25e29fe65fdc14ae3ccdce884d.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: guix/packages.scm
Diffstat (limited to 'gnu/packages/qt.scm')
| -rw-r--r-- | gnu/packages/qt.scm | 72 |
1 files changed, 42 insertions, 30 deletions
diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 2a0872bcdc..6aa467acef 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -118,22 +118,28 @@ X11 (yet).") (("/bin/pwd") (which "pwd"))) ;; do not pass "--enable-fast-install", which makes the ;; configure process fail - (zero? (system* "./configure" - "-verbose" - "-prefix" out - "-opensource" - "-confirm-license" - ;; drop all special machine instructions - "-no-sse2" - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx" - "-no-avx2" - "-no-neon" - "-no-mips_dsp" - "-no-mips_dspr2")))) + (zero? (system* + "./configure" + "-verbose" + "-prefix" out + "-opensource" + "-confirm-license" + ;; drop special machine instructions not supported + ;; on all instances of the target + ,@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + '() + '("-no-sse2")) + "-no-sse3" + "-no-ssse3" + "-no-sse4.1" + "-no-sse4.2" + "-no-avx" + "-no-avx2" + "-no-neon" + "-no-mips_dsp" + "-no-mips_dspr2")))) %standard-phases))) (home-page "http://qt-project.org/") (synopsis "Cross-platform GUI library") @@ -165,20 +171,26 @@ developers using C++ or QML, a CSS & JavaScript like language.") (("/bin/pwd") (which "pwd"))) ;; do not pass "--enable-fast-install", which makes the ;; configure process fail - (zero? (system* "./configure" - "-verbose" - "-prefix" out - "-opensource" - "-confirm-license" - ;; drop all special machine instructions - "-no-mmx" + (zero? (system* + "./configure" + "-verbose" + "-prefix" out + "-opensource" + "-confirm-license" + ;; drop special machine instructions not supported + ;; on all instances of the target + ,@(if (string-prefix? "x86_64" + (or (%current-target-system) + (%current-system))) + '() + '("-no-mmx" "-no-3dnow" "-no-sse" - "-no-sse2" - "-no-sse3" - "-no-ssse3" - "-no-sse4.1" - "-no-sse4.2" - "-no-avx" - "-no-neon")))) + "-no-sse2")) + "-no-sse3" + "-no-ssse3" + "-no-sse4.1" + "-no-sse4.2" + "-no-avx" + "-no-neon")))) %standard-phases))))) |