From patchwork Tue Apr 29 15:31:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42147 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 607F727BC4B; Tue, 29 Apr 2025 16:33:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D8F7C27BC49 for ; Tue, 29 Apr 2025 16:33:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9mxM-0002ez-IQ; Tue, 29 Apr 2025 11:33:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9mxJ-0002eE-5f for guix-patches@gnu.org; Tue, 29 Apr 2025 11:33:09 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9mxI-0006GI-QA for guix-patches@gnu.org; Tue, 29 Apr 2025 11:33:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=nSXfXjEHKF6UtXz6io7MhJLBtSGZH6EB4wmo4caJETQ=; b=OmB7/dUMBzjIRGR0iqJA9EX44gP/HX6qEuQWgNC4ED6a8mBHJDOs1sJTCayDcXB7C01naYtTjPtJqGlJEPPmpTS5ErmZKff2w+qfOlnxHZDMP0QBrd833emukfG2KTfdsoo6Jv7rBWVE9p2yRm0dR8LlS8jeFNqgjsBgsrKzCumCVf3NSIIlU28LtqdIAO4ZWicCNxYehNtmwbHYCpGTpoSfW/1kwxyR9EE+jVB5pMHBGZos8jmlGeyTYxzY7b/2VRfUAWoV/NamsZet0bOuPl3SYQpAiON/Ip+ZviNm8WuHIx7Tg2yZpu4urBa862nT5umztVElfIlqDkY1USNbEA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9mxG-0006Og-IA; Tue, 29 Apr 2025 11:33:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78102] [PATCH v2 1/3] build/cmake: Add #:implicit-inputs? and #:implicit-cross-inputs? arguments. References: <9966a347ee398a118b13a1febfcf62d7f77d0cc8.1745808541.git.maxim.cournoyer@gmail.com> In-Reply-To: <9966a347ee398a118b13a1febfcf62d7f77d0cc8.1745808541.git.maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 15:33:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78102@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Gabriel Wicki X-Debbugs-Original-Xcc: Maxim Cournoyer , Gabriel Wicki Received: via spool by 78102-submit@debbugs.gnu.org id=B78102.174594073124182 (code B ref 78102); Tue, 29 Apr 2025 15:33:06 +0000 Received: (at 78102) by debbugs.gnu.org; 29 Apr 2025 15:32:11 +0000 Received: from localhost ([127.0.0.1]:58135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9mwM-0006Hx-N0 for submit@debbugs.gnu.org; Tue, 29 Apr 2025 11:32:11 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:48419) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9mwI-0006Gv-4M for 78102@debbugs.gnu.org; Tue, 29 Apr 2025 11:32:06 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7396f13b750so6804206b3a.1 for <78102@debbugs.gnu.org>; Tue, 29 Apr 2025 08:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745940719; x=1746545519; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nSXfXjEHKF6UtXz6io7MhJLBtSGZH6EB4wmo4caJETQ=; b=fulxbc5eF7dW8/+7nZv9bg9JAztkxV+GDWJjgpn+piyigjl89NF3xgF+TfsRmEaGOS IT9ZJdvRJLt6zij5AwJ2nFTvIFnUY6uS1AHD4QVbVJchkFO1WBZCSqNogWHTKIPOfv93 oeJi0loY+xzGh2mu9iVQAV6vWIegXmqKTUs63BmQ3m5D1gZFp3sCSopohgWY+iauUq+q hQern25SELu2iKtHzUFUsTa+UOmqjqZecgGG6dUdhmkiXn+OdvWkyL6aFKNW4mVDIpqs jIaURTFfYfdaNnUy1Il4kgahPId61PCRbe9az2kUWsUAaAo0SskvKnf6nu66NhAXPZMm dfCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745940719; x=1746545519; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nSXfXjEHKF6UtXz6io7MhJLBtSGZH6EB4wmo4caJETQ=; b=sfBq9WI+/m1Ea7aRyjLHc8xHii3WlzQHD2NpVHOykHsw3yqqzFGmZ5ilGAiIKn9fFB tTFzJXPfykyqqN47ZhF7zoNTbzMpTjEf6EzrsLh+3lWByDAN8WasBPPS/izKc3kt0kxS lUfndOvJV3P0I+pY153moYEcYuS5jviJfwIz8k+tIq3uUwZfSlH0oHF2cAQO8LW2X7Xd vo8ugY+tUSGSlABwyLvOhA4L+tAuQMdZac11n3FvJbmX8/rV0fIAOxrh68uOILK/+NRf B1jCsLJZyEZy7hXufAqYRKh1YRZD7WMddk3MM6knh7ZBfVnXz2g2o7YwA5XyovCW98Ow TXgQ== X-Gm-Message-State: AOJu0YwoTESJfr6KuPO0R0T+J8yNeSJ2HD6i1/22vpytUKlKHclzlPZ7 nr0LjwwHv/JqiHbH++aKCof+1H5DHc9Tw19ObuPN7a4pYCRn6DpP/HM+7A== X-Gm-Gg: ASbGncuU2DkLkJYer+RnAwoQCHpiq4d3cnb+Miw5SuW48xGsT6mOYMNEcnLl6kXQ+SF E5thT04GqzfqBdExfsEf5SZv1z4Y/10JH/TCsjC/67uBDPG2jffoOl8drZ8b8BcJyVnrIJ+R0sp 3r9iYx2LggXJcJIFjDuRIpkeaiAnzKkSJLCRJ8UNm1pAb6pp5kpnyW5NJl7aWsguvgm7//Qm/Km 6vP0pqcOOCw0bZ+4vZS4ikve1NQtzI1GcIuKBR3LRRxUklIGOyN6J6Y/AYQaTJTyUt/epzStKVq qftPUQ9ynWQ3t7OvB33gmJPKY2SvrOmOh1E68jDjkGVtsp0nJ9jJVpThpq68QYIIBhnaqTY= X-Google-Smtp-Source: AGHT+IG2Q0MGB5MjWOAw2omTchVGzmLroCVG2hNjn6w903qtWem4Km3d2ywNjw21NbkS2+Dks/24Yg== X-Received: by 2002:a05:6a00:1942:b0:736:a8db:93b8 with SMTP id d2e1a72fcca58-7402925e549mr4869370b3a.3.1745940719210; Tue, 29 Apr 2025 08:31:59 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a420sm10303533b3a.107.2025.04.29.08.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 08:31:57 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 30 Apr 2025 00:31:37 +0900 Message-ID: <7e9be31603f35d063e9568fe7650be901e671951.1745940699.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/cmake.scm (lower) <#:implicit-inputs?> <#:implicit-cross-inputs?>: New arguments. Change-Id: I1f077f78f5836ce325827e7ef8d58ba554a8ed4f --- guix/build-system/cmake.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) base-commit: 2b4680c6c17bd6470f78a1f39d2f7af8b05e279f diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 9d757c0d061..8b1889e36bc 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2025 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,12 +66,14 @@ (define (default-cmake target) (define* (lower name #:key source inputs native-inputs outputs system target + (implicit-inputs? #t) (implicit-cross-inputs? #t) (cmake (default-cmake target)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." (define private-keywords `(#:cmake #:inputs #:native-inputs + #:implicit-inputs? #:implicit-cross-inputs? ,@(if target '() '(#:target)))) (bag @@ -83,13 +86,15 @@ (define* (lower name ,@`(("cmake" ,cmake)) ,@native-inputs ,@(if target '() inputs) - ,@(if target + ,@(if (and target implicit-cross-inputs?) ;; Use the standard cross inputs of ;; 'gnu-build-system'. (standard-cross-packages target 'host) '()) ;; Keep the standard inputs of 'gnu-build-system'. - ,@(standard-packages))) + ,@(if implicit-inputs? + (standard-packages system) + '()))) (host-inputs (if target inputs '())) ;; The cross-libc is really a target package, but for bootstrapping @@ -97,7 +102,7 @@ (define* (lower name ;; native package, so it would end up using a "native" variant of ;; 'cross-libc' (built with 'gnu-build'), whereas all the other packages ;; would use a target variant (built with 'gnu-cross-build'.) - (target-inputs (if target + (target-inputs (if (and target implicit-cross-inputs?) (standard-cross-packages target 'target) '())) (outputs outputs) From patchwork Tue Apr 29 15:31:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42146 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 BD3CC27BC49; Tue, 29 Apr 2025 16:33:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E210B27BC4A for ; Tue, 29 Apr 2025 16:33:21 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9mxK-0002eU-Li; Tue, 29 Apr 2025 11:33:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9mxI-0002e7-PM for guix-patches@gnu.org; Tue, 29 Apr 2025 11:33:08 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9mxI-0006G1-Bi for guix-patches@gnu.org; Tue, 29 Apr 2025 11:33:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=cDdWP0OOnsgpnLzCcVMtZS5uuxbrR3GvNMSquv71eEE=; b=Oo12Wxqa9XjfXF6Y0ZcgAQJ+EV/KYvsjTwVK8faGaR6MfQ8VLaIwoWicRHt2Hy214br44W/K4O2zUCazdxQF1+cgk64Sow3jbX9xjwhFkAFS4myn++k2XU6/Fh3z9hcTURcr/RQAkK0pVOJaxRjWgB1RHy7ckC+VLZv7vM/DT8MjUv2+JdetOMky59LXgByOz7/2WoMHxQ83ud6ca6uOdr70zd66hdx7uwvPr3iZdtPcmKJzSppKnKHtML1KFosXD16ToLYAob+ajF6vJCDT7b2BkqaHdUWmQD9dEH1Xm/40v/X8n5KIqI+s0N6la08iUfbWxKXoH1ZcG/73wKrE7g==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9mxH-0006Or-I3; Tue, 29 Apr 2025 11:33:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78102] [PATCH v2 2/3] gnu: libcxx: Fix cross-compilation build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 15:33:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78102@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Gabriel Wicki X-Debbugs-Original-Xcc: Maxim Cournoyer , Gabriel Wicki Received: via spool by 78102-submit@debbugs.gnu.org id=B78102.174594074124284 (code B ref 78102); Tue, 29 Apr 2025 15:33:07 +0000 Received: (at 78102) by debbugs.gnu.org; 29 Apr 2025 15:32:21 +0000 Received: from localhost ([127.0.0.1]:58139 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9mwT-0006JE-5g for submit@debbugs.gnu.org; Tue, 29 Apr 2025 11:32:21 -0400 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]:61478) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9mwN-0006Hm-SM for 78102@debbugs.gnu.org; Tue, 29 Apr 2025 11:32:13 -0400 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-736c3e7b390so6268445b3a.2 for <78102@debbugs.gnu.org>; Tue, 29 Apr 2025 08:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745940725; x=1746545525; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cDdWP0OOnsgpnLzCcVMtZS5uuxbrR3GvNMSquv71eEE=; b=T8VDfG5Z8f9TgiQ4pzD9uZk/ADb4tlym5kel+CI4wEMwSy/Kk5qRSxYRbWOJoDbS16 8hvRUUO66o3/uKFT/27m/2t4SC+0FJEjwmhoWFPRI35AM8aekGvJCe77BJ4CWpiQoqFA tg/l2PuROECbyyodjCqFEqimQDwRJ/fEstr24FEenEZ2Wheold9SiwaRaW81KHJSCc8b DiYJDXiI95xCXNm0IIaIlYHv+28+MG1ElyrKP2iuV3bBVifeIFRLvqUP06vpgIVWoz0O ltX1fLHbMnFtWcgNZIWYZ77Pv0d07H/9TQUTo+xwSPhIoGeAh9YyddNfatmv7pmVCktK CYFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745940725; x=1746545525; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cDdWP0OOnsgpnLzCcVMtZS5uuxbrR3GvNMSquv71eEE=; b=TZ+vUrAMpDmPasrMIlN4so1D7S2wLg+J81qVd1PE67VM5yHJfbB5bA/yupcAfGh6iL +n+irwd8am99flUCpZeF3oftZbtNsyJVy1vrH+bXaYyhKCXHLIm7TI/HROyJr3dZCRzP iYuYHBtI7gTsvIYFTIl43OdhBn9dqUxmSzsWwxAPZRYW3dnZEsDO9ziKagmXz3zfl9dO a10JRJppA7vB+JVYuXlEB/P06FFK8ehew7m38/Eq2CwrKABrekSf55F/st1AuFPCceqY u34Horoe7MSeega4Lix7WgUytNZNGCDTDWVqOmVDMrS0dVuQAf/rC3K3+8gAGdot27i3 H7EA== X-Gm-Message-State: AOJu0YwTD5Nge/WTK3y/bCNhYFR701QNG0k4vEGU9d60c4mAAIqxZFAn +gXUQM5N5I05mEvgxCIikpufE3xEcVYalpuqLkdrsVT+lb65jIt6zfWzpQ== X-Gm-Gg: ASbGncvXdH98KnAfq6lSU3hLZ4PXbKWTuoyJPEGTVa6ruSZNSRP1p9KsVoygfYC9xqi HxbX06CuPasn3QzWhJHqwBl00fNDAZ65MI6WHtXv7b7zFCfzTtirtLHKXDxEGQKtr1yZL40/8Ke Ez5eBpA5QKSHaO1Vn8mS1qw9/2IbjiRU3oIuQuK8KMWspEYp351q9OAb52VoNixIRWQHTNdO/TO iOCrxi8FT3f7aHYGvJ5TZHWf9XRfwbyyo05hzUdEjGBtncybomZH2b7Za9kUsAk6yb5ySquSKyy YpF4bc6sDLpgJavxA6TIMl8a9e1CTnDNERQFS1UsY7nZKYM38OPB/gyT3O3u X-Google-Smtp-Source: AGHT+IFHzVY0WGdg1ypwwf6DbMfAjTOymL+zIb2QTF+UREGVOKn/6S4phSb8y9So1EB/1lvBLnBzpQ== X-Received: by 2002:a05:6a00:3927:b0:732:2923:b70f with SMTP id d2e1a72fcca58-740271689ffmr5462349b3a.11.1745940725031; Tue, 29 Apr 2025 08:32:05 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a420sm10303533b3a.107.2025.04.29.08.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 08:32:04 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 30 Apr 2025 00:31:38 +0900 Message-ID: <47cce130906c96519b8f1505897c3986663b6276.1745940699.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <7e9be31603f35d063e9568fe7650be901e671951.1745940699.git.maxim.cournoyer@gmail.com> References: <7e9be31603f35d063e9568fe7650be901e671951.1745940699.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/llvm.scm (libcxx) [arguments] <#:implicit-inputs?>: Set to #f. <#:phases>: Remove adjust-CPLUS_INCLUDE_PATH. [native-inputs]: Explicitly provide standard inputs, filtering out gcc. Change-Id: I8cbc73ef90dce0a57bf2f8198c3176932bf24185 --- gnu/packages/llvm.scm | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm index a0f47447bee..49b6e27bff9 100644 --- a/gnu/packages/llvm.scm +++ b/gnu/packages/llvm.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Giacomo Leidi ;;; Copyright © 2020 Jakub Kądziołka ;;; Copyright © 2021, 2022 Maxime Devos -;;; Copyright © 2020, 2021, 2022, 2024 Maxim Cournoyer +;;; Copyright © 2020-2022, 2024-2025 Maxim Cournoyer ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Lars-Dominik Braun ;;; Copyright © 2021, 2022 Guillaume Le Vaillant @@ -52,6 +52,7 @@ (define-module (gnu packages llvm) #:use-module (guix memoization) #:use-module (guix search-paths) #:use-module (guix utils) + #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix build-system emacs) #:use-module (guix build-system python) @@ -1905,6 +1906,7 @@ (define-public libcxx (build-system cmake-build-system) (arguments (list + #:implicit-inputs? #f ;to avoid conflicting GCC headers #:tests? #f #:configure-flags #~(list "-DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi;libunwind" @@ -1920,23 +1922,14 @@ (define-public libcxx #~(modify-phases %standard-phases (add-after 'unpack 'enter-subdirectory (lambda _ - (chdir "runtimes"))) - (add-after 'set-paths 'adjust-CPLUS_INCLUDE_PATH - (lambda* (#:key inputs #:allow-other-keys) - (let ((gcc (assoc-ref inputs "gcc"))) - ;; Hide GCC's C++ headers so that they do not interfere with - ;; the ones we are attempting to build. - (setenv "CPLUS_INCLUDE_PATH" - (string-join (delete (string-append gcc "/include/c++") - (string-split (getenv "CPLUS_INCLUDE_PATH") - #\:)) - ":")) - (format #t - "environment variable `CPLUS_INCLUDE_PATH' changed to ~a~%" - (getenv "CPLUS_INCLUDE_PATH")) - #t)))))) + (chdir "runtimes")))))) (native-inputs - (list clang-19 libunwind-headers llvm python)) + (append (list clang-19 libunwind-headers llvm python) + ;; Remove GCC from the build environment, to avoid its C++ + ;; headers (include/c++), which would interfere and cause build + ;; failures. + (map second + (alist-delete "gcc" (standard-packages))))) (home-page "https://libcxx.llvm.org") (synopsis "C++ standard library") (description From patchwork Tue Apr 29 15:31:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42148 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 2CA8327BC4B; Tue, 29 Apr 2025 16:35:13 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7C08127BC49 for ; Tue, 29 Apr 2025 16:35:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9mzC-0002vU-AO; Tue, 29 Apr 2025 11:35:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1u9mz9-0002ue-QW for guix-patches@gnu.org; Tue, 29 Apr 2025 11:35:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u9mz9-0006lL-G0 for guix-patches@gnu.org; Tue, 29 Apr 2025 11:35:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=9suYX6bQhGhvMf2qaST/+nFqSz11aJEYPv2RWrL2JiA=; b=ZM32pN/Kq9rK71EbOVKRJx5o1LMOrGRyukZB4l7OUpbOpXmfLFAOtZ3EBTquBD16ZANr1g3v/IavSKmO+0iqGigfahoyVP/xVofFxBLbFmRE+nZMku7OotuuJ1JAZG6eEqsX1y1qiMQG27KzJdjPZFr5Ev7iiej+Ak8mLqrjD7IapN7Udt71vbySuFvre9CFvXBea9DfPc41wpMjVI+nuvGaFg55ANSHsP6DCnOsWlrElec7ml7ssYJA+47RdVJEq76NHalSBlQD+uQhIAFxfy4IAh/IPdPIz3lub80EaWv17eiMa/y/uE4/aXuxcK3YetPw/tisY2UZdM6JlxfdJA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9mz9-0006c2-AK; Tue, 29 Apr 2025 11:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78102] [PATCH v2 3/3] gnu: Add redumper. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 15:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78102@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Gabriel Wicki X-Debbugs-Original-Xcc: Maxim Cournoyer , Gabriel Wicki Received: via spool by 78102-submit@debbugs.gnu.org id=B78102.174594087925216 (code B ref 78102); Tue, 29 Apr 2025 15:35:03 +0000 Received: (at 78102) by debbugs.gnu.org; 29 Apr 2025 15:34:39 +0000 Received: from localhost ([127.0.0.1]:58186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9myk-0006Ya-Cy for submit@debbugs.gnu.org; Tue, 29 Apr 2025 11:34:39 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]:57451) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9myh-0006Y8-Ck for 78102@debbugs.gnu.org; Tue, 29 Apr 2025 11:34:36 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-736c1cf75e4so5269513b3a.2 for <78102@debbugs.gnu.org>; Tue, 29 Apr 2025 08:34:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745940868; x=1746545668; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9suYX6bQhGhvMf2qaST/+nFqSz11aJEYPv2RWrL2JiA=; b=YYubBISMOwdRbsLMOYYtxW7ZDsgPxuoACqBwa+pA2tkpkw7eVfsL1cuBHjiQAx24Sh KQLQwzOnWZMLWTqNMXAAmXUyUzxvQuVuQvVMio2dffsj8gWHZj6wzSeZQ1GBjFKklsYG QMKSOcEmHy9R0rt6xUCyApgzOgnXKBeL76FBckKpVRv0QHcKEOJZPjqmLW8m+q2Fa/+y 7QNdSHquOuorbTKzx+z/nl9yjohFev0tjoT5IbMEl/G8btYDUwzB9x5BK+/Dlt4yak3f +5N290CMpDZBfyMmuo9ES298DcVGtmOssJos6/Ey1sqYJJBnrLADyqH4HieLF0UJuuqz 2NMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745940868; x=1746545668; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9suYX6bQhGhvMf2qaST/+nFqSz11aJEYPv2RWrL2JiA=; b=b+f7BIxJ2SfR9GFJkCm5ojVL7beh1pfIIjf5dP/ijd6IbfzV6OheoP47NbqG3wjlAe /XrM0UEzCpuBk/nnCARbnMDywbpChZ39B7PhuHylBbVr89xFTa6G0O8M1zz0iGgfhPef vy55GGOOMesVCBRqOIYN5II3tioYDY8m1rBggG3/Uf3JpCLxvDkeuxMW1cp7uZOd9FjP PZ6pAT3q2NIO+DTi+g2ODA5g9rLz7Lkcm3UDuI3ADWP7S9zmsCLT9T4RCJuhUpH+SoB+ TS5nX0/NO5GGe8BKkhffghbctbKlC86qlwvRim+Yg0B1sREWeYP+5cgFyBLsbTKS+Top /yaw== X-Gm-Message-State: AOJu0YyY/Y01Cv2lLlLM+PWlmNN+MRi0FAfUWPXPYYg5cV+3ciCzTURs MMg39mLUtBkKYVn1ANXKFdsXCexACJjBIlH/CLWtoSKz1O9sPRuu6doJfQ== X-Gm-Gg: ASbGncuj/xwRwWn6J+bqqYFE2Nh9UXa5HHiHWNpZA4ase8j8TAg2OKz/VB+Hsbjf/fa 1u+szGnTUnzVYHNQtubxL9mKt3pRXjDp5yUKiZ8io6yAThR0iIk/Tw9PYZwykUDMYVf8Inba9cg BgZV1cB469KL7i/AfrJCSym5+GUSX/sa+X40/WxaWum0ZGBttwLfMcr7whC8dQSiVYezqV2IEuM h2lTxPMob01JnLKyoDg6mWHgJCNKBhOfxUc8o+0lup31MvYj+FQm5oR2m7szEqVo8YYs0kMyUG4 3xECV1y3h60Oj9Q9dv/5cPW5if52jJQ/6nbNjK8zu3bqUJpnMB3PouCS1/aMPRj8nKxXy94= X-Google-Smtp-Source: AGHT+IGh24J4f0SfRtppVbvFJeBVZOa8Ywl3xYXHzsex6CC/J36f7WWeB89S20S0xf/has3Y0v0I+g== X-Received: by 2002:a05:6a00:4f85:b0:736:32d2:aa82 with SMTP id d2e1a72fcca58-740272324femr5422751b3a.23.1745940868396; Tue, 29 Apr 2025 08:34:28 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a420sm10303533b3a.107.2025.04.29.08.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 08:34:26 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 30 Apr 2025 00:31:40 +0900 Message-ID: <7fc835e9456493c2d85fca94bfde7a87e25cbd29.1745940699.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <7e9be31603f35d063e9568fe7650be901e671951.1745940699.git.maxim.cournoyer@gmail.com> References: <7e9be31603f35d063e9568fe7650be901e671951.1745940699.git.maxim.cournoyer@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/audio.scm (redumper): New variable. Change-Id: I3740c6941d1ab11ac38993775a8004618636513c --- I was not able to fix cross-compilation when using clang, as it fails to detect the glibc library objects needed. Here's an attempt: ;; The build system uses CMake modules features that are only available ;; when using Ninja. - #:configure-flags #~(list "-GNinja" - "-DREDUMPER_CLANG_USE_LIBCPP=ON" - (string-append "-DREDUMPER_VERSION_BUILD=" - #$version) - "-DCMAKE_BUILD_TYPE=Release") + #:configure-flags + #~(list "-GNinja" + "-DCMAKE_CXX_COMPILER=clang++" + #$@(if (%current-target-system) + (list (string-append "-DCMAKE_CXX_COMPILER_TARGET=" + (%current-target-system))) + '()) + "-DREDUMPER_CLANG_USE_LIBCPP=ON" + (string-append "-DREDUMPER_VERSION_BUILD=" + #$version) + "-DCMAKE_BUILD_TYPE=Release") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-build-system Which errors like: Run Build Command(s): /gnu/store/w02489mcgfg5mj9z4c6nmnh3185v5xlv-ninja-1.11.1/bin/ninja -v cmTC_aa843 [1/2] /gnu/store/dfi5zbk288grsj5xnxpcihyy235sb2zv-clang-toolchain-19.1.7/bin/clang++ --target=i686-linux-gnu -MD -MT CMakeFiles/cmTC_aa843.dir/testCXXCompiler.cxx.o -MF CMakeFiles/cmTC_aa843.dir/testCXXCompiler.cxx.o.d -o CMakeFiles/cmTC_aa843.dir/testCXXCompiler.cxx.o -c /tmp/guix-build-redumper-561.drv-0/build/CMakeFiles/CMakeScratch/TryCompile-he4ad3/testCXXCompiler.cxx [2/2] : && /gnu/store/dfi5zbk288grsj5xnxpcihyy235sb2zv-clang-toolchain-19.1.7/bin/clang++ --target=i686-linux-gnu CMakeFiles/cmTC_aa843.dir/testCXXCompiler.cxx.o -o cmTC_aa843 && : FAILED: cmTC_aa843 : && /gnu/store/dfi5zbk288grsj5xnxpcihyy235sb2zv-clang-toolchain-19.1.7/bin/clang++ --target=i686-linux-gnu CMakeFiles/cmTC_aa843.dir/testCXXCompiler.cxx.o -o cmTC_aa843 && : /gnu/store/m8nars4f5d5x0sfhdlz69nc5blfyym1q-binutils-cross-i686-linux-gnu-2.41/bin/i686-linux-gnu-ld: cannot find crtbeginS.o: No such file or directory /gnu/store/m8nars4f5d5x0sfhdlz69nc5blfyym1q-binutils-cross-i686-linux-gnu-2.41/bin/i686-linux-gnu-ld: cannot find -lstdc++: No such file or directory gnu/packages/audio.scm | 76 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm index 03867b2da36..3850b916ca5 100644 --- a/gnu/packages/audio.scm +++ b/gnu/packages/audio.scm @@ -126,6 +126,7 @@ (define-module (gnu packages audio) #:use-module (gnu packages music) #:use-module (gnu packages ncurses) #:use-module (gnu packages networking) + #:use-module (gnu packages ninja) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) @@ -4082,6 +4083,81 @@ (define-public libshout-idjc ;; GNU Library (not Lesser) General Public License. (license license:lgpl2.0+))) +(define-public redumper + (package + (name "redumper") + (version "561") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/superg/redumper") + (commit (string-append "build_" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1r0wfi0fn3rq7s28p89rkgpgf567akd8z25l8r9sj7p4p3xp9m91")))) + (build-system cmake-build-system) + (arguments + (list + #:cmake cmake-next + #:build-type "Release" + ;; The build system uses CMake modules features that are only available + ;; when using Ninja. + #:configure-flags #~(list "-GNinja" + "-DREDUMPER_CLANG_USE_LIBCPP=ON" + (string-append "-DREDUMPER_VERSION_BUILD=" + #$version) + "-DCMAKE_BUILD_TYPE=Release") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-build-system + (lambda _ + ;; The CMAKE_SYSTEM_VERSION is undefined when cross-compiling. + (substitute* "CMakeLists.txt" + (("\\$\\{CMAKE_SYSTEM_VERSION}") + "\"${CMAKE_SYSTEM_VERSION}\"")))) + (add-after 'unpack 'adjust-CPLUS_INCLUDE_PATH + ;; The libcxx include/c++/v1 directory is not exposed via + ;; CPLUS_INCLUDE_PATH by default, causing errors like + ;; "fatal error: 'format' file not found". + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (setenv "CPLUS_INCLUDE_PATH" + (string-append + (search-input-directory inputs + "/include/c++/v1") + ":" (getenv "CPLUS_INCLUDE_PATH"))))) + (replace 'build + (lambda* (#:key parallel-build? #:allow-other-keys) + (invoke "cmake" "--build" "." + "-j" (number->string + (if parallel-build? + (parallel-job-count) + 1))))) + (replace 'check + (lambda* (#:key build-type parallel-tests? tests? + #:allow-other-keys) + (when tests? + (invoke "ctest" "-C" build-type + "-j" (number->string + (if parallel-tests? + (parallel-job-count) + 1)))))) + (replace 'install + (lambda _ + ;; There is no CMake install target; manually install the + ;; binary. + (install-file "redumper" + (string-append #$output "/bin"))))))) + (native-inputs (list ninja clang-toolchain-19)) + (inputs (list libcxx)) + (home-page "https://github.com/superg/redumper") + (synopsis "Low-level CD/DVD dumper") + (description "@command{redumper} is a low-level byte perfect CD disc +dumper. It supports incremental dumps, advanced SCSI/C2 repair, intelligent +audio CD offset detection, among other features. @command{redumper} is also a +general purpose DVD/HD-DVD/Blu-ray disc dumper.") + (license license:gpl3+))) + (define-public resample (package (name "resample")