unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Efraim Flashner <efraim@flashner.co.il>
To: 33136@debbugs.gnu.org
Subject: [bug#33136] [PATCH 6/7] gnu: qt@4: Update build config.
Date: Wed, 24 Oct 2018 14:41:33 +0300	[thread overview]
Message-ID: <20181024114134.3116-6-efraim@flashner.co.il> (raw)
In-Reply-To: <20181024112618.2417-1-efraim@flashner.co.il>

* 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.
---
 gnu/packages/qt.scm | 5 +++++
 1 file changed, 5 insertions(+)

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

  parent reply	other threads:[~2018-10-24 11:42 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-24 11:26 [bug#33136] [PATCH 0/7] Qt updates Efraim Flashner
2018-10-24 11:41 ` [bug#33136] [PATCH 1/7] gnu: qt: Update to 5.11.2 Efraim Flashner
2018-10-26  9:50   ` Danny Milosavljevic
2018-10-24 11:41 ` [bug#33136] [PATCH 2/7] gnu: qt: Use system sqlite Efraim Flashner
2018-10-26  9:45   ` Danny Milosavljevic
2018-10-27 20:19     ` Efraim Flashner
2018-10-28 17:17       ` Danny Milosavljevic
2018-10-24 11:41 ` [bug#33136] [PATCH 3/7] gnu: qt: Add vulkan support Efraim Flashner
2018-10-26  9:47   ` Danny Milosavljevic
2018-10-27 20:21     ` Efraim Flashner
2018-10-24 11:41 ` [bug#33136] [PATCH 4/7] gnu: qt: Use invoke Efraim Flashner
2018-10-26  9:48   ` Danny Milosavljevic
2018-10-24 11:41 ` [bug#33136] [PATCH 5/7] gnu: qt@4: Update license list Efraim Flashner
2018-10-26  9:49   ` Danny Milosavljevic
2018-10-28  8:13     ` Efraim Flashner
2018-10-24 11:41 ` Efraim Flashner [this message]
2018-10-26  9:50   ` [bug#33136] [PATCH 6/7] gnu: qt@4: Update build config Danny Milosavljevic
2018-10-24 11:41 ` [bug#33136] [PATCH 7/7] gnu: qt@4: Use invoke Efraim Flashner
2018-10-26  9:50   ` Danny Milosavljevic
2018-10-28  8:14 ` bug#33136: Qt updates Efraim Flashner
2018-10-28  9:38   ` [bug#33136] " Clément Lassieur

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181024114134.3116-6-efraim@flashner.co.il \
    --to=efraim@flashner.co.il \
    --cc=33136@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).