mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-02 08:07:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: qt@4: Update build config.

Browse source 
* gnu/packages/qt.scm (qt@4)[arguments]: Substitute hardcoded '/bin/ls'
invocation. Add configure-flags to not build the examples or demos.
Don't use the precompiled headers.
This commit is contained in:
Efraim Flashner 2018-10-21 10:04:34 +03:00
parent 3ea61f9642
commit 1f71daf499
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/qt.scm
View file

@ -430,11 +430,14 @@ (define-public qt-4
(doc (assoc-ref outputs "doc"))) (doc (assoc-ref outputs "doc")))
(substitute* '("configure") (substitute* '("configure")
(("/bin/pwd") (which "pwd"))) (("/bin/pwd") (which "pwd")))
(substitute* "src/corelib/global/global.pri"
(("/bin/ls") (which "ls")))
(zero? (system* (zero? (system*
"./configure" "./configure"
"-verbose" "-verbose"
"-prefix" out "-prefix" out
"-nomake" "examples demos"
;; Note: Don't pass '-docdir' since 'qmake' and ;; Note: Don't pass '-docdir' since 'qmake' and
;; libQtCore would record its value, thereby defeating ;; libQtCore would record its value, thereby defeating
;; the whole point of having a separate output. ;; the whole point of having a separate output.
@ -457,6 +460,8 @@ (define-public qt-4
;; Skip the webkit module; it fails to build on armhf ;; Skip the webkit module; it fails to build on armhf
;; and, apart from that, may pose security risks. ;; and, apart from that, may pose security risks.
"-no-webkit" "-no-webkit"
;; don't use the precompiled headers
"-no-pch"
;; drop special machine instructions not supported ;; drop special machine instructions not supported
;; on all instances of the target ;; on all instances of the target
,@(if (string-prefix? "x86_64" ,@(if (string-prefix? "x86_64"