From patchwork Wed Oct 24 11:41:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 16 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 139A7165AB; Wed, 24 Oct 2018 12:48:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id A16AC16449 for ; Wed, 24 Oct 2018 12:48:24 +0100 (BST) Received: from localhost ([::1]:47743 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHeB-0005sw-Vg for patchwork@mira.cbaines.net; Wed, 24 Oct 2018 07:48:24 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#33136] [PATCH 6/7] gnu: qt@4: Update build config. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Oct 2018 11:42:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33136 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33136@debbugs.gnu.org Received: via spool by 33136-submit@debbugs.gnu.org id=B33136.154038132026562 (code B ref 33136); Wed, 24 Oct 2018 11:42:04 +0000 Received: (at 33136) by debbugs.gnu.org; 24 Oct 2018 11:42:00 +0000 Received: from localhost ([127.0.0.1]:39159 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gFHXz-0006uC-Jd for submit@debbugs.gnu.org; Wed, 24 Oct 2018 07:41:59 -0400 Received: from flashner.co.il ([178.62.234.194]:50696) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gFHXx-0006tF-Sq for 33136@debbugs.gnu.org; Wed, 24 Oct 2018 07:41:58 -0400 Received: from localhost (unknown [141.226.14.143]) by flashner.co.il (Postfix) with ESMTPSA id 2E01A40214; Wed, 24 Oct 2018 11:41:52 +0000 (UTC) From: Efraim Flashner Date: Wed, 24 Oct 2018 14:41:33 +0300 Message-Id: <20181024114134.3116-6-efraim@flashner.co.il> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181024112618.2417-1-efraim@flashner.co.il> References: <20181024112618.2417-1-efraim@flashner.co.il> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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"