From patchwork Sun Dec 22 21:40:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 19426 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 87C71178CE; Sun, 22 Dec 2019 21:41:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 4EFE017857 for ; Sun, 22 Dec 2019 21:41:15 +0000 (GMT) Received: from localhost ([::1]:50892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ij8yQ-0002oL-A6 for patchwork@mira.cbaines.net; Sun, 22 Dec 2019 16:41:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47564) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ij8yG-0002o3-J3 for guix-patches@gnu.org; Sun, 22 Dec 2019 16:41:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ij8yE-0007uS-M2 for guix-patches@gnu.org; Sun, 22 Dec 2019 16:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44358) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ij8yE-0007sq-H3 for guix-patches@gnu.org; Sun, 22 Dec 2019 16:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ij8yE-0003yx-Cw for guix-patches@gnu.org; Sun, 22 Dec 2019 16:41:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38711] [PATCH] build-system: qt: Actually use qt-build-system, not cmake-build-system. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 22 Dec 2019 21:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 38711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38711@debbugs.gnu.org Cc: ludo@gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.157705081615244 (code B ref -1); Sun, 22 Dec 2019 21:41:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Dec 2019 21:40:16 +0000 Received: from localhost ([127.0.0.1]:50331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ij8xT-0003xm-KG for submit@debbugs.gnu.org; Sun, 22 Dec 2019 16:40:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:57277) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ij8xR-0003xe-EI for submit@debbugs.gnu.org; Sun, 22 Dec 2019 16:40:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46312) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ij8xQ-0002gJ-0g for guix-patches@gnu.org; Sun, 22 Dec 2019 16:40:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ij8xO-0003uu-NE for guix-patches@gnu.org; Sun, 22 Dec 2019 16:40:11 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:45094) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ij8xO-0003eb-GF; Sun, 22 Dec 2019 16:40:10 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 47gwr724vCz1qqkQ; Sun, 22 Dec 2019 22:40:07 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 47gwr718h6z1yH07; Sun, 22 Dec 2019 22:40:07 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id p_3jqWleuNlQ; Sun, 22 Dec 2019 22:40:06 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-188-174-48-16.dynamic.mnet-online.de [188.174.48.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sun, 22 Dec 2019 22:40:06 +0100 (CET) Received: from thisbe.fritz.box (unknown [192.168.110.24]) by hermia.goebel-consult.de (Postfix) with ESMTP id 908D26017A; Sun, 22 Dec 2019 22:41:22 +0100 (CET) From: Hartmut Goebel Date: Sun, 22 Dec 2019 22:40:03 +0100 Message-Id: <20191222214003.7352-1-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.21.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] 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: 209.51.188.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 When the qt-build-system was created, based on the cmake-build-system, some references to cmake have been missed to be changed. * guix/build-system/qt.scm (qt-build, qt-cross-build)[modules]: Use qt-build-system, not cmake-build-system. [builder]: Call qt-build, not cmake-build. --- guix/build-system/qt.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/guix/build-system/qt.scm b/guix/build-system/qt.scm index b776845377..67fdfa1230 100644 --- a/guix/build-system/qt.scm +++ b/guix/build-system/qt.scm @@ -126,14 +126,14 @@ (qt-wrap-excluded-outputs ''()) (system (%current-system)) (imported-modules %qt-build-system-modules) - (modules '((guix build cmake-build-system) + (modules '((guix build qt-build-system) (guix build utils)))) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." (define builder `(begin (use-modules ,@modules) - (cmake-build #:source ,(match (assoc-ref inputs "source") + (qt-build #:source ,(match (assoc-ref inputs "source") (((? derivation? source)) (derivation->output-path source)) ((source) @@ -208,7 +208,7 @@ provides a 'CMakeLists.txt' file as its build system." (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %qt-build-system-modules) - (modules '((guix build cmake-build-system) + (modules '((guix build qt-build-system) (guix build utils)))) "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its @@ -237,7 +237,7 @@ build system." `(,name . ,path))) target-drvs)) - (cmake-build #:source ,(match (assoc-ref native-drvs "source") + (qt-build #:source ,(match (assoc-ref native-drvs "source") (((? derivation? source)) (derivation->output-path source)) ((source)