From patchwork Wed May 10 17:46:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 49920 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 3D50C27BBEE; Wed, 10 May 2023 18:50:40 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, 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 DA53627BBEC for ; Wed, 10 May 2023 18:50:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pwnx4-0005OT-8S; Wed, 10 May 2023 13:50:10 -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 1pwnww-0005Nl-Hg for guix-patches@gnu.org; Wed, 10 May 2023 13:50:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pwnww-0004ei-6t for guix-patches@gnu.org; Wed, 10 May 2023 13:50:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pwnww-0005Vv-30 for guix-patches@gnu.org; Wed, 10 May 2023 13:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63422] [PATCH 3/3] gnu: libfive: Generate bindings instead of using pre-generated ones. Resent-From: Morgan Smith Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 May 2023 17:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63422 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63422@debbugs.gnu.org Received: via spool by 63422-submit@debbugs.gnu.org id=B63422.168374099321169 (code B ref 63422); Wed, 10 May 2023 17:50:02 +0000 Received: (at 63422) by debbugs.gnu.org; 10 May 2023 17:49:53 +0000 Received: from localhost ([127.0.0.1]:48981 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwnwn-0005VN-2O for submit@debbugs.gnu.org; Wed, 10 May 2023 13:49:53 -0400 Received: from mail-co1nam11olkn2043.outbound.protection.outlook.com ([40.92.18.43]:19681 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pwnwk-0005V9-Sm for 63422@debbugs.gnu.org; Wed, 10 May 2023 13:49:52 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ABHfrihlCVVVzciNFzVuY/SUxRQyvJ7eYuyLH2MOPJHnGqBnl0EgxlZMdp58y4SgC1HorvqvBIT05GioOxvcXbVQUW8KPQRiO3hd7asGFag9ZsOWcFk1AbM40cb0Uc0zCt3D80z4l91s8iL3tBQ79Ea+c3UDUXdu6Gh4lP45ecYkjqgecKaHQTv+nCQ3/QRv+HZxSQJHizCgQgAZ/DesjSgFQgwZGuAFcecP4k8S+aDtsNQCRiUzrrw3NBka06OqTddtHG1XgL7X22HLD3TfvzCQYLZi2Afy1ypkVEyVQnIQF+hbZzXwhExTrlEWFnKSYnrQT/eSt/4euufxc04AqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8b1gdTGmCGv8O8xJSnxnUN33PtMin/Fvmb0MeMSuHiE=; b=U5QeyelxwSlcQVp1NfCx5Q3efkvYQ7ImiADz0eiYFxxOk6d9wIJ7ejEXp431fhgippt/fITnTPvPf5vsZGu88ls0jkyWSIn52J8GBW1eqgRx7W7XNMPNRuvY93QavuprBrA9mgp0PT4bJEQwFYQkERjcmX5Ml+q/MHzMzypMdIbyo47+eQmmEne1XXv3sgwq91QaqRgXM8eEzI3aWpaRriUToNmCnL/juSxskM7oXBGdIub3FEgZl4MCp0wFtzaVkni5MDbALA95VPF3s8aHnyIVEfU/rbnb73T+p2lu57fPuZGxuomhqcJUFGfXaOs5r5NimodbKheN7NRPps+R1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8b1gdTGmCGv8O8xJSnxnUN33PtMin/Fvmb0MeMSuHiE=; b=h5lFnUdxbE710ChL8kc1+ibkxmQe4qfZhAz9GTZ6BE9Fq50Nl4hNJCKZITam+8lHxnyYqTf3tW1JeStMN3uMNWA1K/jbVy93YDUnl88ALb0tyWmFHCvS0lGOqFubXAqB8Qu4ogbL+aaRhFeLTeQKpLD9vwSRijl9rXpY8kSoR45KwqbUrVFB1YchmwrTzPo9LjkcD4vWmrM2DyRFNH4Nu9QyJkRzdUTcSmRYRMCBuECE9Xqc1IG6ea0bhoLDqsVqNHoBmsFX8qp2X/wYgs+PXG+c+TxvpTK+zwR2pV+Qv8oDSz22c4qS2vAmFsiVdTJOAATZE5tFTV1rwFdWHtd4kA== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by PH7PR03MB7439.namprd03.prod.outlook.com (2603:10b6:510:2e7::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.19; Wed, 10 May 2023 17:49:44 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9a6e:a037:320a:19c6]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::9a6e:a037:320a:19c6%7]) with mapi id 15.20.6340.030; Wed, 10 May 2023 17:49:44 +0000 From: Morgan Smith Date: Wed, 10 May 2023 13:46:20 -0400 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: References: X-TMN: [vLbxuBS9mM8S+1ifW6OdjhszyjMufOGb] X-ClientProxiedBy: YQBPR0101CA0136.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:e::9) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <8734a5b7a3b9394514db50c15b0f980c2f4333fa.1683740776.git.Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|PH7PR03MB7439:EE_ X-MS-Office365-Filtering-Correlation-Id: 9d6b8a7c-a001-414a-edf8-08db517ef013 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hlM7jA5oBUd9HwKEX9PVLqLtqGwFqggbQoUfvsp87M/3h180iq0aqtshZSMuPQ4slhB3Sa6nLbqVSyz1qINp6LJABCnJgZ8qQ0ebyagRjzXXinyQS7hrVK4NNb3dt/TKqixA/fUqhu8nKClQBCR3tbwMg/udGHPE5JpWfee5gbO9C4AneYaiIkeMwB7qmvR6ia8NqEV8483qxyOTHne3/eIJsiEm33cuOIaVPzginmZGbPojSx3x64OxDe7qhxEVKAkonx6BdzjkOAUFJQuLjCIE3+AEIIVuCqmOQb+bI63yQUExBvlaQ4qzXuAdHmYxjzXrcv8fNwhqgDIadv2GfRqsYMin7CHTnVGFKCOelbeBu6Nr+UwLjQ41d78ZFuYAai2okHy/lJ2oTDLWitI4hvDzyYkLobWsDwo7WanYAFF4msHCrKoB++JOPIQmiSeo5FIgPwae92wTQKnyRs8gb8WL3ZX0u2bojGJIObds2MBvPwc7upPMv83vFsPtGuzkffkCgDEu4JTXI3vDeup+aETr7Otu24FEenCylWjGnYvkjPmRiR4xzAwPRe2b5pH8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TRoMH9dPi5rorPJGncUdjMWknTdyiQ9Ebgl5pM7P3Rf2xcucFo//47uv3XPfr2BSbQ5I8WnMry5yxOPfOC/5dwm/JzGFIn91ZPicBMpkRx5A9ks1FiozRKsiI8m/cYzG3t9VQ/ANuwIlbpEXnTVGD/GuOoFr2gQF7D9/SJ/pPOT2XCes2ECtHO5UvOVIKMCVwzj7fkhPYMe/He4h+nyx59O+LijKQCk/eb4wVxpNGCQVuo4Jmvx8glSs1BCsXm+b5i+i2W2qOjXZt77uBx508b+PngVPYUZ7ktytWkR+zmORxYNO96MALhYiBUG1fntAEu/huSm9m9X2q7dickMUHIRMwd2v0LXIdmYxAbh17jJRSKqwZJNIVzRHBf2ZSnikGNu95m5+F8aLNnSjAEUQerS9l7x5vqkw+LDr3PCKK2NjHovodiN4BkdE4Ylj1nyp/RoiHou6QgqbxJSJfH/KEdaItkK9xZoLW5LjbrHf12wi2DcX1lcv3pdpElTrX7VvYEqMf+KneTADXAxlsEpqk+mb1EY8ZCt52Rrs1QFbHPQWRU+CMJgYm7sStP/vvUw89cPzwTDJNbOrZK+QgOoHJQ4NjdvQfpO38mYSjHsMmqgVCNUeC8YQaqpAjk0ZYFmM/WoVW1SY3PqV4YTsgNuE+wVik6H3ehoQsnBCvr959lNzmsav7EuQijCjeJFOC66ocZVUL1ZHTUSAjrWt1Pxzq/ENh7cs8pWlI0xQcNRwTpjLZSbHe1G0rFtgd0OHz8I97WtYLbUncKmVFYo83ae85NNLQFX97YHRzjONsEJaXL0Pw38r0OOdUf2ka2nPLVwshpBcG/yfwzwAurKhYy9oRjCicqOxVBr2yo8+Z9NxOwhXdP9txvkXUyMNXIGAZB9dmQB5Kgtu1UjoOkJod6q4B+EjXYz0gOTtMBukB6z0rzbNfhfYPZ++WWOOnIN92LRWE91qWerqcoOx1Cb52EevEqcYdV79ETaaXXRqkvywU+vs+pt+bvPymryqquSn5lOZt218xF0jFaKbisqL4ThWdRDXJwbWDhkkAYPvJYBKQddjxIZJm6DccCXNL5aPUMPWP8Fv/PW9IuchJHvC1yLQ0ptHwsrATlADIp7Sou6a0JYlYemdM+I3RMPhZ3Y1NS6r0TR5Q0XGj90okGiFGaxuaxpkQ079HcUMZJFvcPBqrELl50UOlYcXDUu3sSAeC2kJbCBGetoXVKbhDyxrUWhAWJulqBeG8N7rKM7sfR6+jos= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d6b8a7c-a001-414a-edf8-08db517ef013 X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2023 17:49:44.1409 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR03MB7439 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/engineering.scm (libfive)[phases]: Add phase 'generate-bindings to generate the bindings --- gnu/packages/engineering.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index be7e235fcc..ec3071129e 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -941,6 +941,16 @@ (define-public libfive (substitute* "libfive/bind/python/libfive/ffi.py" (("os.environ.get\\('LIBFIVE_FRAMEWORK_DIR'\\)" m) (string-append m " or \"" #$output "/lib/\""))))) + (add-before 'build 'generate-bindings + (lambda _ + ;; These files already exist but we regenerate them from source + (with-directory-excursion "../source/libfive/stdlib" + (substitute* '("gen_scm.py" "gen_c.py" "gen_py.py") + (("datetime.now\\(\\)\\.strftime\\([^)]+)") "\"N/A\"") + (("os\\.getlogin\\(\\)") "\"guix\"")) + (invoke "python" "gen_scm.py") + (invoke "python" "gen_c.py") + (invoke "python" "gen_py.py")))) (add-after 'unpack 'do-not-build-guile-bindings (lambda _ (delete-file "libfive/bind/guile/CMakeLists.txt")