From patchwork Wed Oct 24 11:41:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Efraim Flashner X-Patchwork-Id: 21 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 B451D165AB; Wed, 24 Oct 2018 12:48:49 +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 531F816449 for ; Wed, 24 Oct 2018 12:48:49 +0100 (BST) Received: from localhost ([::1]:47756 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHea-0006AH-Lw for patchwork@mira.cbaines.net; Wed, 24 Oct 2018 07:48:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gFHYP-0007pm-Fo for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gFHY7-0007N3-VK for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:12 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:34909) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gFHY5-0007Lj-8t for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gFHY5-0006vR-2H for guix-patches@gnu.org; Wed, 24 Oct 2018 07:42:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#33136] [PATCH 7/7] gnu: qt@4: Use invoke. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 24 Oct 2018 11:42:05 +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.154038132426615 (code B ref 33136); Wed, 24 Oct 2018 11:42:05 +0000 Received: (at 33136) by debbugs.gnu.org; 24 Oct 2018 11:42:04 +0000 Received: from localhost ([127.0.0.1]:39165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gFHY3-0006v5-V9 for submit@debbugs.gnu.org; Wed, 24 Oct 2018 07:42:04 -0400 Received: from flashner.co.il ([178.62.234.194]:50700) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gFHXz-0006tN-6Z for 33136@debbugs.gnu.org; Wed, 24 Oct 2018 07:41:59 -0400 Received: from localhost (unknown [141.226.14.143]) by flashner.co.il (Postfix) with ESMTPSA id 78B47400E4; Wed, 24 Oct 2018 11:41:53 +0000 (UTC) From: Efraim Flashner Date: Wed, 24 Oct 2018 14:41:34 +0300 Message-Id: <20181024114134.3116-7-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]: Use invoke. --- gnu/packages/qt.scm | 88 ++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm index 966b35456..fc8e8768b 100644 --- a/gnu/packages/qt.scm +++ b/gnu/packages/qt.scm @@ -433,50 +433,50 @@ system, and the core design of Django is reused in Grantlee.") (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. - "-datadir" (string-append out "/share/qt-" ,version - "/data") - "-importdir" (string-append out "/lib/qt-4" - "/imports") - "-plugindir" (string-append out "/lib/qt-4" - "/plugins") - "-translationdir" (string-append out "/share/qt-" ,version - "/translations") - "-demosdir" (string-append out "/share/qt-" ,version - "/demos") - "-examplesdir" (string-append out "/share/qt-" ,version - "/examples") - "-opensource" - "-confirm-license" - ;; explicitly link with dbus instead of dlopening it - "-dbus-linked" - ;; 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" - (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"))))) + (invoke + "./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. + "-datadir" (string-append out "/share/qt-" ,version + "/data") + "-importdir" (string-append out "/lib/qt-4" + "/imports") + "-plugindir" (string-append out "/lib/qt-4" + "/plugins") + "-translationdir" (string-append out "/share/qt-" ,version + "/translations") + "-demosdir" (string-append out "/share/qt-" ,version + "/demos") + "-examplesdir" (string-append out "/share/qt-" ,version + "/examples") + "-opensource" + "-confirm-license" + ;; explicitly link with dbus instead of dlopening it + "-dbus-linked" + ;; 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" + (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")))) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys)