Message ID | 20190821085455.18508-12-m.othacehe@gmail.com |
---|---|
State | Accepted |
Headers | show
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E142517264; Wed, 21 Aug 2019 09:59:03 +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=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_DKIM_INVALID 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 A68AF1724B for <patchwork@mira.cbaines.net>; Wed, 21 Aug 2019 09:59:03 +0100 (BST) Received: from localhost ([::1]:45654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org>) id 1i0MSM-0001dp-Ra for patchwork@mira.cbaines.net; Wed, 21 Aug 2019 04:59:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58636) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MPc-0006fW-9G for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MPb-0005HW-2F for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54079) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MPa-0005HI-Uu for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1i0MPa-0006Yl-PT for guix-patches@gnu.org; Wed, 21 Aug 2019 04:56:10 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36477] [PATCH v2 12/61] gnu: cmake: Fix cross-compilation. Resent-From: Mathieu Othacehe <m.othacehe@gmail.com> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 21 Aug 2019 08:56:10 +0000 Resent-Message-ID: <handler.36477.B36477.156637772724741@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36477 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 36477@debbugs.gnu.org Received: via spool by 36477-submit@debbugs.gnu.org id=B36477.156637772724741 (code B ref 36477); Wed, 21 Aug 2019 08:56:10 +0000 Received: (at 36477) by debbugs.gnu.org; 21 Aug 2019 08:55:27 +0000 Received: from localhost ([127.0.0.1]:34583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1i0MOt-0006Qr-53 for submit@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:27 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:37970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <m.othacehe@gmail.com>) id 1i0MOh-0006Nc-WE for 36477@debbugs.gnu.org; Wed, 21 Aug 2019 04:55:16 -0400 Received: by mail-wm1-f65.google.com with SMTP id m125so1280166wmm.3 for <36477@debbugs.gnu.org>; Wed, 21 Aug 2019 01:55:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2krCJLit+1UiRIYhchssO6oCwDpYGq03kWH7mdQah2I=; b=lKs0FCsMCiTAL97qCX/gE1b8Uc7jM/tj8dv+E8I2UGmQwa6TmWekInZW1YP11Q7QS5 jVTZvddl8NvRD66DMESf5Rze61qhBa+Nt3q94sfmkQ+YQediX9NBUaKYMHDMFfMhPtfJ qDsiH5wInziq9z6z9VjRKP8n9DS7U+NUXFf3ZiVpvX4DBDKjw0vOFPAGuEhAEwT6uxrE yAsGcEMtB1BrLVbOVHyxx63XCpo+CudI2dG74BfC49R/dsaSiemi97fZyZ5m5uY/eZou y58zjv0dhVxiL3+mYYKyGRyKIrW0CD94uROJ7Rp0Opmn/deaWhusYG7OZDAoMWDtWeWq joIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2krCJLit+1UiRIYhchssO6oCwDpYGq03kWH7mdQah2I=; b=X03ECSve4cWgG8V58P8xriFoBUutG4EmnVv7ESGRZPctjSTuFDY631vxIKV0q8IBzb E3zpP4qW4e+LxnScSlwHA9SrD98ZX6NbpBt7KERZc8ECTvme1mis7Zmo0kZkmY0OgKvL 2vYhGA4wr6VVIe/Tu5Yr3VB5yZyBuPe8hzzrhBIlYI65HT2uLstByRQEkoCxtsJvN23k D5E/rPBTjtj1zN4a74FBgnbmFNSb74Hmk244KG/vRrpmwnVI0LFafgYNWlw/0g/6S+jP E9VHvk1hFD8G9AK2+5Q6az2pKnz8AB184pV9lx9fP/UQ3O9pRJ3AYdPOUcgoac5G3LI6 RcdQ== X-Gm-Message-State: APjAAAVg05o06jVfqdxFJQhJAYfHQBVVf0MpemVGk+gfb1WJF/XylnR1 35YpG49KCEGNoCyBU5EAJ5hmQDf1FO8= X-Google-Smtp-Source: APXvYqzXjiOt/CZXrlyRAJEvF3Zr4dtKzWvx3DdbJ11hJfv4rlYcQzqCZcUm8LdvW+AMNuUYgYm42A== X-Received: by 2002:a7b:cd17:: with SMTP id f23mr4854881wmj.177.1566377709953; Wed, 21 Aug 2019 01:55:09 -0700 (PDT) Received: from fuji.Parrot.Biz (smtp.parrot.biz. [62.23.167.188]) by smtp.gmail.com with ESMTPSA id v3sm22110739wrq.34.2019.08.21.01.55.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 01:55:09 -0700 (PDT) From: Mathieu Othacehe <m.othacehe@gmail.com> Date: Wed, 21 Aug 2019 10:54:06 +0200 Message-Id: <20190821085455.18508-12-m.othacehe@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190821085455.18508-1-m.othacehe@gmail.com> References: <20190821085455.18508-1-m.othacehe@gmail.com> 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Cc: Mathieu Othacehe <m.othacehe@gmail.com> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-getmail-retrieved-from-mailbox: Patches |
Series |
Add --target support to guix system
|
expand
|
diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 1d8d829ec5..9bf0273f00 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -207,6 +207,14 @@ and workspaces that can be used in the compiler environment of your choice.") (outputs '("out" "doc")) (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) +(define-public cmake-minimal-cross + (package + (inherit cmake-minimal) + (name "cmake-minimal-cross") + (native-search-paths '()) + (search-paths + (package-native-search-paths cmake-minimal)))) + (define-public emacs-cmake-mode (package (inherit cmake) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index ca88fadddf..aa0f4187ec 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -43,16 +43,19 @@ `((guix build cmake-build-system) ,@%gnu-build-system-modules)) -(define (default-cmake) +(define (default-cmake target) "Return the default CMake package." ;; Do not use `@' to avoid introducing circular dependencies. (let ((module (resolve-interface '(gnu packages cmake)))) - (module-ref module 'cmake-minimal))) + (module-ref module + (if target + 'cmake-minimal-cross + 'cmake-minimal)))) (define* (lower name #:key source inputs native-inputs outputs system target - (cmake (default-cmake)) + (cmake (default-cmake target)) #:allow-other-keys #:rest arguments) "Return a bag for NAME."