From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48706) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHY8-0007aU-7B for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFHY4-0007LY-Vb for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34908) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gFHY4-0007LJ-OS for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gFHY4-0006vK-Jx for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:04 -0400 Subject: [bug#33136] [PATCH 6/7] gnu: qt@4: Update build config. Resent-Message-ID: From: Efraim Flashner Date: Wed, 24 Oct 2018 14:41:33 +0300 Message-Id: <20181024114134.3116-6-efraim@flashner.co.il> In-Reply-To: <20181024112618.2417-1-efraim@flashner.co.il> References: <20181024112618.2417-1-efraim@flashner.co.il> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 33136@debbugs.gnu.org * 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