From patchwork Wed Jun 9 15:32:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 30079 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 8191D27BC81; Wed, 9 Jun 2021 16:38:01 +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 16F9B27BC78 for ; Wed, 9 Jun 2021 16:38:01 +0100 (BST) Received: from localhost ([::1]:48450 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lr0HI-0003pA-4F for patchwork@mira.cbaines.net; Wed, 09 Jun 2021 11:38:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lr0DS-00052v-UW for guix-patches@gnu.org; Wed, 09 Jun 2021 11:34:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51128) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lr0DS-0006pU-ND for guix-patches@gnu.org; Wed, 09 Jun 2021 11:34:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lr0DS-0000Gq-DO for guix-patches@gnu.org; Wed, 09 Jun 2021 11:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48205] [PATCH v2] gnu: emacs-org: Make build reproducible References: In-Reply-To: Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 09 Jun 2021 15:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48205 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: ludo@gnu.org Cc: Morgan Smith , 48205@debbugs.gnu.org Received: via spool by 48205-submit@debbugs.gnu.org id=B48205.1623252787946 (code B ref 48205); Wed, 09 Jun 2021 15:34:02 +0000 Received: (at 48205) by debbugs.gnu.org; 9 Jun 2021 15:33:07 +0000 Received: from localhost ([127.0.0.1]:34437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lr0CY-0000FC-So for submit@debbugs.gnu.org; Wed, 09 Jun 2021 11:33:07 -0400 Received: from mail-bn8nam08olkn2023.outbound.protection.outlook.com ([40.92.47.23]:38369 helo=NAM04-BN8-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lr0CU-0000Ee-19 for 48205@debbugs.gnu.org; Wed, 09 Jun 2021 11:33:06 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N5Qy0qmUrjjsGhS8FhaN/arhJO7Wh+v65lLRkYcaU7e31DgHnc3KawYSmbGa11sfECq4WiXgrjpwcLFOTAUG+JhxNEFzTASxtt7Rz6AtabHWTfNS9OG7Nd/f4aWqS1b8oHEJ7lL1zPiS/CoPsWY++/9zYlRGXXeRZxUncSVRVVTeDt33wRBRuRSXSsyKkiZ3D3RlYJkHy8o6PassP34znL2VZJZwDme/ZN57UN3uSYGtAbMXe5wVJdstirOptKecxteyqpqZ1+8jYtpRxypqjKFk2l5eGLLinD1JiSMQ9cklnHRQfR748uwXTJV0KBZ+mnX7lHwxykLORQPQtd6W7Q== 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=te0jO2ZbAUaQW8p34tqmMrgoqKwAPIGlzinePg4Cpa0=; b=FPwSO4kVga4oC/uHqtt5O05YciVVFenbpxepZHvdDRjjQ2kX+97buY4246WpKki1PLjwZfwNO0aIeVLXRuIQeyrflrkpOCZy8SDXKL2hYvxtK+4XRebwTyFWoQqWkVR+eqGXBA4SX+Fz/RlJt4Q0K6ihBwBn8NtibDf00RY4Bpgb4h+WsZBh6/iI8NI0TL4e/ND81Ftg+AjACnx4pelYnEc+VdRFfWGVr8xg4Ob133120d5o59gOJSP6q1uB0se9oeWkBXCO68XEBLbgIjqZRpxWtF0Ps61/EplxCuXHfD53px2c/sOYnamlFsrfcHiUnvALjC5SSVV/Ub1E1MYPkw== 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=te0jO2ZbAUaQW8p34tqmMrgoqKwAPIGlzinePg4Cpa0=; b=m4L1ia/Ya9T6/fIy0/TDH/nHSozaJp6sQtd7UMeNjGAtYRe5dDAbvxbBb2X6EYMq8g3uU1n9UxA51yBJw18o+JxxAbOdH3Gq5P4vgfgrgyCAgr/Tc/Y8WAnmDXesp1CDGRKERzRPOA255dVeKWMLixjUQTcqGYoMIbS9duyGYH2efXJayy6U6PakQo+B6KChiGM54vcKrIGS3faa8k7sURhn+YhOKIKswS7wWju8orPCijblUTX75C6TkLR7pHSTCy4mDZxcYW2byWsJn9QXrgl9JA5xD2SQNHktAD/FwG+eh3gz+jdPKX+ksuc4eDSnY32iAPvkLaOXPik8YRCMLg== Received: from DM6NAM04FT011.eop-NAM04.prod.protection.outlook.com (2a01:111:e400:7ea3::40) by DM6NAM04HT156.eop-NAM04.prod.protection.outlook.com (2a01:111:e400:7ea3::370) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.18; Wed, 9 Jun 2021 15:32:56 +0000 Received: from BYAPR05MB4023.namprd05.prod.outlook.com (2a01:111:e400:7ea3::4b) by DM6NAM04FT011.mail.protection.outlook.com (2a01:111:e400:7ea3::66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.18 via Frontend Transport; Wed, 9 Jun 2021 15:32:56 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:B43B7987D997DBFCD156D8CCCF0CA42777A06D3175BBC9E1166B62CAAC9695BF; UpperCasedChecksum:F191641CED5C5452E98EB5F16BA20A6AB10E7E18571D400F31F0D1D81DCBE8BB; SizeAsReceived:7310; Count:45 Received: from BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::a8fb:37d1:b1a7:6841]) by BYAPR05MB4023.namprd05.prod.outlook.com ([fe80::a8fb:37d1:b1a7:6841%5]) with mapi id 15.20.4219.021; Wed, 9 Jun 2021 15:32:56 +0000 From: Morgan.J.Smith@outlook.com Date: Wed, 9 Jun 2021 11:32:02 -0400 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [Rhgh8suSfmASSA+rXAho7MkP/lrJD+oI] X-ClientProxiedBy: YQBPR0101CA0144.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:e::17) To BYAPR05MB4023.namprd05.prod.outlook.com (2603:10b6:a02:87::30) X-Microsoft-Original-Message-ID: <20210609153201.17382-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (170.52.80.122) by YQBPR0101CA0144.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:c01:e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.20 via Frontend Transport; Wed, 9 Jun 2021 15:32:54 +0000 X-MS-PublicTrafficType: Email X-IncomingHeaderCount: 45 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-Correlation-Id: 1de55d3c-329b-43d5-91e5-08d92b5bda06 X-MS-Exchange-SLBlob-MailProps: 79Jo46q8hhCK3+i2t/SlzOmIDE24RjlSEd54weRsChpdjgSRzroNstGFNLL3uoJCE+RSjMftmVOBUtb0O+35tHaCjhQwN83C4v2PLVsZIqtgRd0018HwJkCXkRemIwKvFYRvIk2/7VihsNmBCslF2yH2WykjbqrPbojKdkN+RGQb5ngn61PACn7zLPEugWStOIJYRhbSEgLSl4VXsK+mjnyYdiaz2cxbztAS4Qb477U/GfDVWubWEkolJTaylHW9vOtz0KRBMw79Y8kddE2sYNjRb9fLBuOJQ3dqnf5BNRUoEt0Za66r9zNHWAxXj/6xQvcxTXrTzyDDie/gd77TGQWl3IU6J091kPgYra2qvjPfn4lr/8cKQ+FUVXdnVW4oV3A4qVcqUYMviMO2bs0dHoRyeaVGQmNWMiMPrpA9c+hkiHGzYL6Jk9SHpaPVxEr4cFhpSObXmXthzCft40Jnuh86kAKrW20PS3aaoGIAotD/PWoGV5Qv6u8akA4f3njzXEb6jtmKFYd+ZA0HR4vKL/VhUc6HveWczZRo1iWLCy/U1MfzzYr39jetgosb7oosMvWI3aotm5G5u03VLxI+MuhcJP1ewRdrSURi05JD43YpDVAEBBLD1tlpfMTaV6nUGsJ5n7TpoDK7PCSP0AwU36tmediBavlIfU8Jz9XzeR8KZl4PnmKi/5mHHRii7ALM X-MS-TrafficTypeDiagnostic: DM6NAM04HT156: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9leDZRwVWotoB5xt1F/8gQ9VEMFNM3FhG0U/Y3Fo7Woe7rUggLdWEZX7WaVRMs+9FhnuUtXniGEtEaiNmsbmO7xipSbDW2pU+t70XLlKfbI0odV4AFtcjUKxCCvmoZ3E/bKrWIEmB/rTUqQsk0WfN63iTz/FrwnzQtFASEhNt/iLMxlfIZg4KGFTugUwJcMSjao0hK7IY5KcS2cjrdt05Z01VoUJlETT0hCYsvXUH1lHOmemhtSClbzkJ0BeWdeuwcX7xK7CE3SSC7RQmw25ZZcDFiEcVfOsvYX5oAyxIGYXVw+8npWOne5RQoa1arGNXgtk9teT4H+fcldrocFrcxRBLA31EVPG4Ujh3P5HGgPuWXy8L1pZKNNMMFLyyovDYp9PZgCTz7CnhVlHNipzig== X-MS-Exchange-AntiSpam-MessageData: vPumDqYdTEaPEjYSqYtHGawOSq6HVqmFVvwUorz+cmZYpi6U3owSfzdcmq+48rjkAVGdeJGNIVEynMKvNV1fhtRMcPi+BDvjuqPnf3NS2OP65d8Za3IT1mmvSmc+1IyuEhF2U9apBV2xUbFnJwdGDg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1de55d3c-329b-43d5-91e5-08d92b5bda06 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2021 15:32:56.1130 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-AuthSource: DM6NAM04FT011.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: DM6NAM04HT156 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/emacs-xyz.scm (emacs-org)[phases]: Remove loaddefs and use autoloads instead. Copy autoloads into build directory. --- Thanks for the suggestions! Sorry about the delay. Also sorry about the comment. It's probably a little too long :/. I need to work on my english and my ability to be concise. gnu/packages/emacs-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 1d954ec5bd..180b2709fe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -11761,6 +11761,27 @@ (define-public emacs-org (arguments `(#:phases (modify-phases %standard-phases + ;; Org ships with the file org-loaddefs.el that functions like our + ;; autoloads. Something about the interaction between the loaddefs + ;; and autoloads makes the build non-deterministic. We should opt for + ;; our autoloads system over the loaddefs since the loaddefs are + ;; autogenerated for the release tarball. org-loaddefs.el is + ;; mentioned by name in the source files so we have to do a blanket + ;; regex search and replace. + (add-after 'unpack 'use-autoloads + (lambda _ + (delete-file "org-loaddefs.el") + (substitute* (find-files "." "\\.el$") + (("org-loaddefs.el") "org-autoloads.el")))) + ;; We create the autoloads directly in the install folder. During + ;; compilation org checks for the autoloads file so we need to copy + ;; it to the build directory. + (add-after 'make-autoloads 'copy-autoload-to-build-dir + (lambda* (#:key outputs #:allow-other-keys) + (copy-file (string-append + (elpa-directory (assoc-ref outputs "out")) + "/org-autoloads.el") + "org-autoloads.el"))) (add-after 'install 'install-documentation (lambda* (#:key outputs #:allow-other-keys) (let* ((share (string-append (assoc-ref outputs "out") "/share"))