From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id AOX4NdGNlGBhMQAAgWs5BA (envelope-from ) for ; Fri, 07 May 2021 02:46:09 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id GFGrMdGNlGD0RgAA1q6Kng (envelope-from ) for ; Fri, 07 May 2021 00:46:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id BE64011AAE for ; Fri, 7 May 2021 02:46:08 +0200 (CEST) Received: from localhost ([::1]:38212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leod5-00020D-K2 for larch@yhetil.org; Thu, 06 May 2021 20:46:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leod2-000207-3Z for guix-patches@gnu.org; Thu, 06 May 2021 20:46:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57382) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1leod0-0004FU-8L for guix-patches@gnu.org; Thu, 06 May 2021 20:46:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1leod0-0002yI-6J for guix-patches@gnu.org; Thu, 06 May 2021 20:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48272] [PATCH] gnu: emacs-ledger-mode: Simplify build Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 May 2021 00:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48272 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48272@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162034835711407 (code B ref -1); Fri, 07 May 2021 00:46:01 +0000 Received: (at submit) by debbugs.gnu.org; 7 May 2021 00:45:57 +0000 Received: from localhost ([127.0.0.1]:40695 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leocv-0002xv-9z for submit@debbugs.gnu.org; Thu, 06 May 2021 20:45:57 -0400 Received: from lists.gnu.org ([209.51.188.17]:39822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1leocs-0002xo-Tf for submit@debbugs.gnu.org; Thu, 06 May 2021 20:45:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53886) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leocs-0001zP-L2 for guix-patches@gnu.org; Thu, 06 May 2021 20:45:54 -0400 Received: from mail-dm6nam08olkn2085.outbound.protection.outlook.com ([40.92.45.85]:30769 helo=NAM04-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leocp-00048I-V7 for guix-patches@gnu.org; Thu, 06 May 2021 20:45:54 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Zn2v5rkdlxqYAg88X83Pt/V0j/Nj12Qv8dpb9bXKMPGUV9Og3O9DTi+HdsBxXllJzkZ1r0nmLXkdWFV4ZsU6jeUXt4VHldkICZT3ulBAn+X5K9nqchvzUQoHH3YTU3xFsTqnBsXrDnT8qg3JKFHjHcWUmcTtVVz66LXhyC1nwsGWClR7DNvoof0X/3Ida2/RkeWBj6fn/Q6ZcizX/uuyfCQIwHjxbye0ovSe6FIMttZMxiyfLL443Y79QEFbzxALYHpvaTZEkx26CZSjzZm3ABjv8F2sWmaafDKDHmCb5bwL1OcY+Rm72Zfoc1imaKc+IjC5y3S+lzge0x8IoaSu+w== 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-SenderADCheck; bh=qIDP6OuETTbCqi2FljIyIIashB4Z3WV05dEYRCzQa5s=; b=TZk3M4A5asb5JBP0OtgvB6upX2lIjU5FqSZH331iRsGsCGUunsmRUxLnFTc9yUfOHjOsDkWAgVeJhO6EDeGoxRY8+PuHU/+BOeRIrlG5YOEnt0b8D7Qe98s72RuC2N060R9dirCg31QYE95biiiC+4eCsegx2ZzuaF73zagqKyrwiQzqZvVqTVdHBTYG7gEWiO9Am9herLJbUEsCqGyzjHg1qyM85O4OD78Fq8NlCkswMANQ16YC2DggWc6MrPDgVXyiJ5BtVlZPcsZo91w7Ja9il3nKC/o2sG4MdV/Ky5tBPjbeoFDx8/VtbWLQJzxMc8T6IlxHfOopQYS28T9hRQ== 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=qIDP6OuETTbCqi2FljIyIIashB4Z3WV05dEYRCzQa5s=; b=tISwkeiknxxBLoL4v0BMlxwUOhFSe5monx6ajIbimel3cNPrIUJn6yRMJxSJx5XKPH6Jsh/hfnkXzxsWP61vtElDTZF6/+8rYLuUWtr3nA2Cvj4qBgt3qBGOip19XoYgEFrKfG+6bNSlqAgjfj+cPjAN7jQsR8BW3BFA0nN76y4xwBFB+aQ1JTsfU1sxFXH5aqvNS9W71D1AwFchIR2bARHi+Xwe/yrwTWKONsPgvAMrItUD675YCu+mZjMiwPEjQmSw/hWR19EGS5IYE6TZsaHWYKuVMhMRhB8Gkn+LuGcBFZbW2l7Hi/4dKuTe+e0BPTjMLIOxqg1Z6+HxwRw9ng== Received: from DM6NAM04FT065.eop-NAM04.prod.protection.outlook.com (2a01:111:e400:7ea3::41) by DM6NAM04HT181.eop-NAM04.prod.protection.outlook.com (2a01:111:e400:7ea3::314) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Fri, 7 May 2021 00:30:46 +0000 Received: from BN7PR05MB4018.namprd05.prod.outlook.com (2a01:111:e400:7ea3::49) by DM6NAM04FT065.mail.protection.outlook.com (2a01:111:e400:7ea3::174) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.21 via Frontend Transport; Fri, 7 May 2021 00:30:46 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:D3C7439426A2320CC16910C8C1C669AFE96676F945DFA81DD846ECA9CB98105D; UpperCasedChecksum:842CD13B921B2852F0552436021423DA7994898591646A11735764F23191BE5F; SizeAsReceived:7263; Count:45 Received: from BN7PR05MB4018.namprd05.prod.outlook.com ([fe80::8c00:cdc9:64ee:f9cb]) by BN7PR05MB4018.namprd05.prod.outlook.com ([fe80::8c00:cdc9:64ee:f9cb%6]) with mapi id 15.20.4129.012; Fri, 7 May 2021 00:30:46 +0000 From: Morgan.J.Smith@outlook.com Date: Thu, 6 May 2021 20:30:11 -0400 Message-ID: X-Mailer: git-send-email 2.31.1 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-TMN: [LYq4YKgiUJhOrCOB+UcjAHZSol6RMpRv] X-ClientProxiedBy: YQBPR01CA0082.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::18) To BN7PR05MB4018.namprd05.prod.outlook.com (2603:10b6:406:8e::16) X-Microsoft-Original-Message-ID: <20210507003010.10986-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from pancake.hitronhub.home (170.52.80.149) by YQBPR01CA0082.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.40 via Frontend Transport; Fri, 7 May 2021 00:30:45 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 02a114a2-80ed-4223-21d3-08d910ef5ae2 X-MS-Exchange-SLBlob-MailProps: apgo5D0uMOHCJZo1i5Nrvtd/FId/3gXsIi3ClBKuqZttMDeABDLBGuWJnwndg1sbQvL6E5737lwpcK2kNA5l6soJ37ZlI3wkAB7OPswI1It2qREtUyTgcJtICxXhvDDX2h08hKkZj0yvh0XrI8VWxJwuomFfJZdiKcUGJq6ZSMs4tQkVzPvEkPKaGKWYi+sbL0I5dx0fkElqojyxW2OxGefK8DsRV+rXD0k0xSOM6cFVva1ua9VD1MIWk4cowLVIG2DiD2OWpgA6EJFhMYblWzjywmjQjF9fJnPXZs9Tl7yS+B8nXWoBGwkVesmSEVq/WrERTuxo5govqsBmaFEaz3by6scPSufzrsIsGwKs+Q2dMkja8OXAOQcwmjdNln3XpdZxqWO6o3pjivs8tamstplRMJqP/g6jovx7FZ7G9+tg8+wlg4wZxaB2GghRm0bfmap+5gS3eMyQvTT6Vz+Z2nmlGPC7D9UuGpJwCfpbk2a7FCqKCiysVtMQwtAg8r2XZxIltfsIYI2rHcuR2g7UdithOXrn/W0C7XY7NaiUBGa9t0FbprQ7HT9cqkDWqQ0d+T9txB23uu9E+P8acEv9+UCty5JQGjjvgLu3KY/9srltqsj7u39n3B5G+xZdlnOp50dWArx2wgtjcDmg2KikFkG1udO+mFjAKzoBuM+8CdQfhRk39OhImp0pUhyj7yY49bAdlMOxDDmKSe4ivqJjTiFm/lwkRHRmu1R8ztJsWi7Dud9naALKJa/6gY1OvkmbF+uymXyf/wN4MuWOmdIm5RECUuHdspYkpwKksEWjBOo2efXCYIKVNEMfYbKQ1jpQMtaVksUyCheyBC5oy50LHf9Gn79Zj7V/xso9wEF8r9zjvGXGYoHwkQq4WxC4f7XlsASH6R6Ksf3inqRocxGUebaT3fvXSRpZg067m2QVHGXobaLyfINEJ9fokEjG+nA9ONuleC 4Ll3LyDw16rk1lLlykDnveXF9scQUpKQlVpGyc0hSY+rzSgQ== X-MS-TrafficTypeDiagnostic: DM6NAM04HT181: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Wge+WErJjKKpep6pdgJH/9UuJRhEJ0VIOTX+0EHBJAM77qHhA+EqrT8cX8enF7npbW1qdtxCnBPTew0BjwvUFeGCOt9Y0YwlVhnmxI76zIBiy73ZbZrRooFUvMnLgC6YenXsLjBlNgekFJmxD8PPAmNhv12RFkribyz+mkqTE9+4DVMnwiaeCg7Y3txpCbZuGwbWv4z1mG6aoE0PIPtKZBh7IKln+oBGBcvVvols/359qmi+18IK9OdOr44i4smFMocunMk10zY211301U5emnmfsxrrnz+nj/bngfRZwcXUNuLM3Wlm1o6OKWyVZmQfFiMOohSkATMDCvlmbT8gBwOdb397HHKhX64/y8lfkrMNBRwKryknjq7hjUREXWNM9FNrKlNH072hc+0JdsPF0xfK/LnOY3zxhQnKag1kwczD7y7vjnruurpqZBcBMBBAhE4+HAf501zOAEavJcnxpA== X-MS-Exchange-AntiSpam-MessageData: JqaJrpbCimFB84RjGxSOYpoPgHnmGelfHmdSlPbiASTaDtXEzkU4eH/aOSyv82K40BqjnakdNym6cBZEkw66QUTexScjEzk/6vhF8lJW8mFq4jVNco14OYCUczCsBCAtEm5jImjIaPs7aaR4Orhmdg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02a114a2-80ed-4223-21d3-08d910ef5ae2 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 00:30:46.3359 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM04FT065.eop-NAM04.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: Internet X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6NAM04HT181 Received-SPF: pass client-ip=40.92.45.85; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM04-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620348369; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=qIDP6OuETTbCqi2FljIyIIashB4Z3WV05dEYRCzQa5s=; b=hjJPA1Cbwscp4SNbuLEFucsUpYe2HKbQsQXoVoR4t+coiAMFmNrXnG3uhhb55sKFk8Qefg xF8KvtofnKqQTNnUjpNu2gaX8lEWh28vbUwHQS+ipUh7I/QhTrNpY2E2aCTfvfyz64BKtI Ptf99/2Ne0l6uLbwHiCqtaI3foJnkSe2/SNbfrGVtJKtLlVedrmZT/PY1JuvpErau/qn/l EVm5hAjYbR+iKutrO7CGZqXre00oDLGRw4t51zX2GfLRzHPYXzjhoNJnuZpKu9P56a0Dcr e85U1arNtdCS9fEcprFrb9/7HaHqzI/4KfXfDBqfa6UGVERv7o1skD5tmSk8IQ== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1620348369; a=rsa-sha256; cv=fail; b=nT/5W+3yYcGNhZi/z8Q3mVCco6HEhUx5woQqE9TxQ94uYWfbBAXLLjuogRAc3FXohwG4N2 4h9IJQfK8vaow5+HAWasvRvspOm/SFGxGOYsPHRXnx7NhMIgjV6N6BVbuzKkN0t+PxGzxP JJ7cEbieyw7b5fJwolVoonJN8oD3fJAkY6Epb00XWVptr+FnK874m7bPHAMHtFyVXvXqPM l2xTwKZV2jy3LUlInM9GTXx4fbnMSeovyBIfQNUhtYDPOLTbaq1R2xqGGwr5r4RyBpcjxH xGKt0jkYV/f7BXy2Spzr8awRB8w4tXyYZA3MavHElv8mV7yQnrvTPpqBGs+imA== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=tISwkeik; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 4.64 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=outlook.com header.s=selector1 header.b=tISwkeik; arc=reject ("signature check failed: fail, {[1] = sig:microsoft.com:reject}"); dmarc=fail reason="SPF not aligned (relaxed)" header.from=outlook.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: BE64011AAE X-Spam-Score: 4.64 X-Migadu-Scanner: scn0.migadu.com X-TUID: RWqSQHYujJgV From: Morgan Smith * gnu/packages/finance.scm (emacs-ledger-mode) [build-system]: Use emacs-build-system instead of cmake [arguments]: - Remove modules and imported-modules. - Move patch-path phase to after unpack so that the substitution actually causes a change. - Remove generate-autoload phase as that's built into the build system. - Remove patch-site-dir as that only affected cmake things [native-inputs]: Remove emacs-minimal --- gnu/packages/finance.scm | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b8ec4a9dc0..077fba9e27 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -400,22 +400,11 @@ (define-public emacs-ledger-mode (file-name (git-file-name name version)) (sha256 (base32 "1r5rcyxd6d1rqwamzpvqdbkbdf1zbj75aaciqijrklnm59ps244y")))) - (build-system cmake-build-system) + (build-system emacs-build-system) (arguments - `(#:modules ((guix build cmake-build-system) - (guix build utils) - (guix build emacs-utils)) - #:imported-modules (,@%cmake-build-system-modules - (guix build emacs-utils)) - #:phases + `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-site-dir - (lambda _ - (substitute* "CMakeLists.txt" - (("DESTINATION share/emacs/site-lisp/ledger-mode") - "DESTINATION share/emacs/site-lisp")) - #t)) - (add-before 'build 'patch-path + (add-after 'unpack 'patch-path (lambda* (#:key inputs #:allow-other-keys) (let ((ledger (assoc-ref inputs "ledger"))) (make-file-writable "ledger-exec.el") @@ -430,12 +419,6 @@ (define-public emacs-ledger-mode (invoke "makeinfo" "-o" target "../source/doc/ledger-mode.texi")) #t)) - (add-after 'install 'generate-autoload - (lambda* (#:key outputs #:allow-other-keys) - (let* ((site-dir (string-append (assoc-ref outputs "out") - "/share/emacs/site-lisp"))) - (emacs-generate-autoloads ,name site-dir)) - #t)) (replace 'check (lambda _ (with-directory-excursion "../source/test" @@ -443,8 +426,7 @@ (define-public emacs-ledger-mode (inputs `(("ledger" ,ledger))) (native-inputs - `(("emacs-minimal" ,emacs-minimal) - ("texinfo" ,texinfo))) + `(("texinfo" ,texinfo))) (home-page "https://ledger-cli.org/") (synopsis "Command-line double-entry accounting program") (description -- 2.31.1