From patchwork Fri May 7 03:58:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 29158 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 5A8AC27BC82; Fri, 7 May 2021 04:59:10 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D913027BC81 for ; Fri, 7 May 2021 04:59:09 +0100 (BST) Received: from localhost ([::1]:53908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lerds-0002Mc-VN for patchwork@mira.cbaines.net; Thu, 06 May 2021 23:59:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52504) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lerdm-0002MV-Pc for guix-patches@gnu.org; Thu, 06 May 2021 23:59:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58129) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lerdm-0006Uf-II for guix-patches@gnu.org; Thu, 06 May 2021 23:59:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lerdm-0004z7-GX for guix-patches@gnu.org; Thu, 06 May 2021 23:59:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48272] [PATCH v2] gnu: emacs-ledger-mode: Simplify build References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 07 May 2021 03:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48272 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48272@debbugs.gnu.org Cc: Morgan Smith Received: via spool by 48272-submit@debbugs.gnu.org id=B48272.162035994119152 (code B ref 48272); Fri, 07 May 2021 03:59:02 +0000 Received: (at 48272) by debbugs.gnu.org; 7 May 2021 03:59:01 +0000 Received: from localhost ([127.0.0.1]:41442 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lerdk-0004yq-VY for submit@debbugs.gnu.org; Thu, 06 May 2021 23:59:01 -0400 Received: from mail-oln040092005093.outbound.protection.outlook.com ([40.92.5.93]:11299 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lerdg-0004ye-8D for 48272@debbugs.gnu.org; Thu, 06 May 2021 23:58:58 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WCpsHB+bQQsSR6latQy1CQRUucjjFpgU4dwtxhx+B1Xt7H/bgeFivnhm/Z6CueaKmL6YXMMpuLZpGzjzXJCBVNAahQ87CL8YSFrNCzhxcnxRJruEIy99Hk9G5bVm42qr2SnnlBd9ldBbHn7zMyGymmFjbb3nHLQ2p3MAd/zj9tQYmxIQXPFG1dTAXU1fmshMY/RNc/p/3bDUh4cd8YMy9W5LcgPCJ/Q8SHf6bwgMeDu/UtssIFewxS4Te0Zejv2R8bGWHWaPP5Ra2BBpxUGTPY64s7pDlIjIYS2ciJq6jIYVcfdig0+VVaO87QRYT+INHdBqlW8auJE+6JPgZs0pOg== 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=RdfTMIludNkbwgDKpaeIHbdZ+spc8ol1s8H2SMMWMRw=; b=GGUDwskeazo4/a3jA1roQI5nTmt81GnvyOfrfBaEp6NDgGX/tzjqEPB5Q/M1QBhGAlfceoOyg4G0nf0JUSBTu/eOgIdRsUO2VKQaysre36+abvBfZXozUCK0W9dJxhqS5R5XyQAkLwPqtkrDAntF0J04TmCjjA7gEAIHXpt3Xu0kt97MYUaLg+C5fjGPW0aISRXhC6DMjJ0Smm/JCFOtkpj1506+ijCSMH3fRyauv8SdtGfFfvr1sWMxzXbrjdlSXW50G6QEx5aGikpbCDKGfYVNpBHYsDAJkRxaCpk+R+Vm6P/YKfny7AwIFMUy1OgVnwYX3PhffMu7z3jVeOs+kg== 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=RdfTMIludNkbwgDKpaeIHbdZ+spc8ol1s8H2SMMWMRw=; b=UCUrJU45E5QQCuzRyMopc/pmSnNqKcxLmaaAh2n5voHkIaBCGfsMib1HzkiUUJOb/fIMpzugywhL+hI4QhTn6KVN6vDpULAibAdhOexZwSo9XP3t63H1M69TNyKjYXqs9b6BUmrh0ew/5KWoZkv/qiEne7fv9C0PI6TWDyHORlsybxN4AqwwokykFF7friiAUpaZeCuaeK7Hi8rxGtPT/W7S+VI+MumVkQRi1KpxCGRe8hT77rDgnPTPtifXL4H5BrAC29qq2zjXRS6Ksb88A5LwlCvDMn3fFTObx6PcI+0ut10LhRGwdBNqzA5cAgNiyahaFLx5Rd/qwMdObuGlxg== Received: from SN1NAM02FT022.eop-nam02.prod.protection.outlook.com (2a01:111:e400:fc4a::40) by SN1NAM02HT0230.eop-nam02.prod.protection.outlook.com (2a01:111:e400:fc4a::230) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.32; Fri, 7 May 2021 03:58:49 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2a01:111:e400:7e44::51) by SN1NAM02FT022.mail.protection.outlook.com (2a01:111:e400:7e44::148) 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 03:58:49 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:984AE605405FA34E7696A6E75E333A70B9A6D777C2E39B7E5032752F33BF392B; UpperCasedChecksum:01F2600F3854D512D5489A0C95D84C775304D2A1ED1B4E3DE931F2B731572CC8; SizeAsReceived:7283; Count:45 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::b92f:829e:18e4:7ba9]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::b92f:829e:18e4:7ba9%2]) with mapi id 15.20.4108.029; Fri, 7 May 2021 03:58:49 +0000 From: Morgan.J.Smith@outlook.com Date: Thu, 6 May 2021 23:58:22 -0400 Message-ID: X-Mailer: git-send-email 2.31.1 X-TMN: [DWtdaH2X/HwCNMRnAPfK5gpCqoWqGSXg] X-ClientProxiedBy: YT1PR01CA0011.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01::24) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20210507035821.16825-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 YT1PR01CA0011.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.37 via Frontend Transport; Fri, 7 May 2021 03:58:48 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: f52723fa-4340-416c-c0d9-08d9110c6b21 X-MS-Exchange-SLBlob-MailProps: ZjXS9V3hPilpqDLLa+ysQeuNQs/S3KV5HnudXnu1j4c91oT3KKedaBEd/Zr92Hp3+4ocIDT+u0ofFKE1qvpWJIYRkgwRX/pKlaFamLZryBzxAsvPr2BFM4u3s+4bGnanLbPE9x+NpGOXwwdcn3SSGglZGwXHBswg3iGC/UTn9SuhLwv7EUqX8ku/ueh8kPqOnhQ8LP4Ltqaf4ziJcMX5Q7T5hR53AqL9TiG3U47BDNCarNhn2AVGd9gLnDID96CBHlcQ2FYob54oe1MZr9/qYxjwyQt0NGtwuUnBgehXA/n7IZ46qWv3Wwi9zDX6kBuBzc295/QYwtB4QCqzpxkLPWldZMp0zqQrCvTZ4teQt2FQZIfqCvJUk6B1tLsLtKYFUguL2bI2os1QGC8wFMRc/fuOsNpt/pJlov1aE4HaKGXyVCwm6EZG8ujsUyD5v3b1Tq5CNF7TTr2sK8OFJKSXXYHG4vLKXC5hI2APdM1NdB9yn0ogEoddjk1zr39HhB8zvY6oqVOoO1griws0SYPKQWN2K4aXvzxvPx/QW/Pyf8297JWhT2yJCVX4ZH3n4pXjxoLGaVNwsGClMCv4QRJ1QvL9D/VMhzfcum++6SWg0ZnNEJJYV34vuxS93nZTyV5aH5aANEmWJF8SWOW6hiM2Dv1EQpo0jrpeJf+KIoissfDuUDXgCXz6y4LOVb4eOjGmnxHClhOE/8CaVSrsTxX5gu6fYLHkfs8Vah4oWh3WRsCRckUKlN8zSLgB5RMNLVv64sT7zXWqn/MZe/8+r64JzYeSaWHAYgVYXqWItmOI6vN9O5gl5/FjzxfOiXlYOMWHI8+QDDNTl9Rcc+Og+rCuTN3Lg0Wi88JYPvrYX4rtzcccwYPOH8DsKqSR6xopXNxFatNCMLFT04wkUjX/ZRT+vb1wjgEKHyBZMkpLrYSc4C0xHunevphR4l2/ME0+g96BR/X2NV3bTr60nG8a3WER3vGXjf/M3FL2xIYX+mx92ZFfiOynq5dRJEta3GXoKj1r+FNIZq6jRi3reF+KYBwl2w== X-MS-TrafficTypeDiagnostic: SN1NAM02HT0230: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XocML8np4s08ulAkSUAvtyHhz/LN5z+IPIWU6MMA2J4HPi+PnEJBTqL102kcEHDjazKP8ibzSL63jAbbgcFGyMk0PQF/D5PnJnzqhfrt4ske5Hty3QoMvJSwOz+UT5aYJBr6eh1k9Ku43SJzF4o7cx/gR9JwvkduCO4zaM8pviXldry4wpBJ1rOKX5ovGTs+lKJ9oGucIr+R25+UocOJIPlRX4CYNtOO2jMNKq9uHB7aPDfZ4vbX3og31SF9IIreGJwgOX5Q7o2c8Sqt1NInj1jHb74xfYm3E+4iqUk7WcL27hlSP/84TpxhMyoZW/HZznZUwQrUNG2KLXDJ1fWkCApP7BNrB2cDZetpNefiqPmKSDLXBDGdydYPmJ7fH9a6GWJgQK0++HHTKImI2zVhkDt/AGDahvEoeFxi3wkIaMk7jvq530Z3OlNXGQ62AveLsVa1EqAEG252DmaZlReFWw== X-MS-Exchange-AntiSpam-MessageData: JjSZCS0Z+t9Fr/clXo9y6EMgqO9EUOIB67MbnGkgauuIvL4g1lnsVYtzUifxK+ICk5bC1kO7EGfPLvgss9+0Fpsa31p2GmIy9n18yVpCsE/ANgvxtSzR9sn8uw7iG8ke8ba6eS00DrUTqL73ukDxag== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f52723fa-4340-416c-c0d9-08d9110c6b21 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2021 03:58:48.9776 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: SN1NAM02FT022.eop-nam02.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: SN1NAM02HT0230 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" X-getmail-retrieved-from-mailbox: Patches 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 - Set #:exclude to '() so we install ledger-test.el [native-inputs]: Remove emacs-minimal --- gnu/packages/finance.scm | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index b8ec4a9dc0..3e03805fa7 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -400,22 +400,13 @@ (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)) + `(;; ledger-test.el is needed at runtime (but probably not for a good reason). + #:exclude '() #: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 +421,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 +428,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