From patchwork Thu Apr 8 17:49:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 28385 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 8BA1627BC6D; Thu, 8 Apr 2021 18:51:43 +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, MAILING_LIST_MULTI,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 B45C827BC70 for ; Thu, 8 Apr 2021 18:51:36 +0100 (BST) Received: from localhost ([::1]:34800 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lUYoZ-000579-RY for patchwork@mira.cbaines.net; Thu, 08 Apr 2021 13:51:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lUYo7-000536-Bg for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36670) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lUYo6-0004L2-Ey for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lUYo6-0003jh-CQ for guix-patches@gnu.org; Thu, 08 Apr 2021 13:51:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47661] [PATCH 11/33] gnu: emacs-ert-runner: Adjust to changes in emacs-build-system. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Apr 2021 17:51:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47661 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47661@debbugs.gnu.org Received: via spool by 47661-submit@debbugs.gnu.org id=B47661.161790425514212 (code B ref 47661); Thu, 08 Apr 2021 17:51:06 +0000 Received: (at 47661) by debbugs.gnu.org; 8 Apr 2021 17:50:55 +0000 Received: from localhost ([127.0.0.1]:48190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnu-0003h9-UE for submit@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:55 -0400 Received: from mailrelay.tugraz.at ([129.27.2.202]:13192) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lUYnt-0003gv-W2 for 47661@debbugs.gnu.org; Thu, 08 Apr 2021 13:50:54 -0400 Received: from localhost.localdomain (194-96-13-79.adsl.highway.telekom.at [194.96.13.79]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4FGTMH4HKzz1LWny for <47661@debbugs.gnu.org>; Thu, 8 Apr 2021 19:50:51 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4FGTMH4HKzz1LWny DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1617904251; bh=k7SSbvAwgLlr0b8/kVqz6hBybNIz8vqxcyPhCZ+5wvo=; h=From:To:Subject:Date:In-Reply-To:References:From; b=qpvj8byCDcL7m74xEOnTkLU7Cg3ES1//WQoSMGZQsdLxsRAbwxp/fTFlCPqBUWWUf CY4f14cP04XkgVlkAvjGzpCNKtqCsX5e45XSd5JPvvkg2h+swczHxgAMBbo8971rer N84eTLWU7EAjiowgD1Pj/WwdLgh08TtDrgjG9ZhY= From: Leo Prikler Date: Thu, 8 Apr 2021 19:49:45 +0200 Message-Id: <20210408175007.13360-11-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210408175007.13360-1-leo.prikler@student.tugraz.at> References: <20210408175007.13360-1-leo.prikler@student.tugraz.at> MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.117 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 * gnu/packages/emacs-xyz.scm (emacs-ert-runner)[install-executable]: Use elpa-directory for the value of ERT_RUNNER. --- gnu/packages/emacs-xyz.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index ecf0e7ace6..7c26e872fe 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -13181,8 +13181,7 @@ variable instead, to remind you of that variable's meaning.") (getenv "TMPDIR") "/source"))) (substitute* "bin/ert-runner" (("ERT_RUNNER=\"\\$\\(dirname \\$\\(dirname \\$0\\)\\)") - (string-append "ERT_RUNNER=\"" out - "/share/emacs/site-lisp"))) + (string-append "ERT_RUNNER=\"" (elpa-directory out)))) (install-file "bin/ert-runner" (string-append out "/bin")) (wrap-program (string-append out "/bin/ert-runner") (list "EMACSLOADPATH" ":" 'prefix