From patchwork Fri Dec 8 11:16:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 57375 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 6F7DC27BBE9; Fri, 8 Dec 2023 11:53:58 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 6D31327BBE2 for ; Fri, 8 Dec 2023 11:53:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBZQV-0003hE-Ru; Fri, 08 Dec 2023 06:53:51 -0500 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 1rBZQT-0003gw-OL for guix-patches@gnu.org; Fri, 08 Dec 2023 06:53:49 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBZQT-0004uD-B9 for guix-patches@gnu.org; Fri, 08 Dec 2023 06:53:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBZQf-0004TD-Ll for guix-patches@gnu.org; Fri, 08 Dec 2023 06:54:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v4 4/5] gnu: emacs-org: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Dec 2023 11:54:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com, andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170203643217148 (code B ref 67260); Fri, 08 Dec 2023 11:54:01 +0000 Received: (at 67260) by debbugs.gnu.org; 8 Dec 2023 11:53:52 +0000 Received: from localhost ([127.0.0.1]:44015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBZQV-0004SW-MA for submit@debbugs.gnu.org; Fri, 08 Dec 2023 06:53:51 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:58571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBZQT-0004Rs-NH for 67260@debbugs.gnu.org; Fri, 08 Dec 2023 06:53:50 -0500 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-54c1cd8d239so2781240a12.0 for <67260@debbugs.gnu.org>; Fri, 08 Dec 2023 03:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702036411; x=1702641211; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=nU4zvREmpTqgGxjaIg5v4BsLmLdrT9MeTxQzuQszmXk=; b=KNnXojKBcSlS937blkdkZT3TKy1pOaW28wOvV2660MvcXev/cPL4qTn2KRYXqUM6GP HInDgNs3od963sU4wCHNf+3KBzx9Ad7HDSE4Kztxsd4Zi5h2Kf2IqxJa8cF67ehBCQfT X+ZugXEorKfbVqqBjGaf/g4GysYrjUeZ8NhW2ViD7nBvy6SLb12ya+OM8ihOAdMHBJ63 2ee9RK8BZqUtERwHq8e352o9L7G8kAWCESZNG6ZMI/aWHkRWqFAu7m2fVhhG3GqpEbgI /4zBoTE5Etb/hppIbFWT7xR/v/9TjbJapC4+v4Rqk0H6KETkVeY/lakOymXkWQDi33M4 UpEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702036411; x=1702641211; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nU4zvREmpTqgGxjaIg5v4BsLmLdrT9MeTxQzuQszmXk=; b=SSMsv7nufXXhFo5gLLSmYu9f+0pFz9ciR6XOdPVwQ5Xv2NJc8HOuLT29eX01U+Q4SC Xsx2ww0XKzjNK9ALL7fNhma1TyI0/h1DH3bZcLsdr5dzet0UXyqn/NObVzZpifJnjdT3 +AmICk/9vEYy46IRG/rNZWmFg0E4Alwg/qwTtoXSDjYXBOjeLCYtlq/c/fMKEBz19CES kiiUNJGlEYEZ14M2BOjV/6hQW0dTBZvLeRnBEhhEoJhJFWMuHmMfOMrv/D03d0VO6S/v U7BgPc1Dwu6mDGThKcwtqpzdnE3KAeya48EAEkt/Fw4cr81qlG+X+U05tW9uW3GPtZU0 r6zQ== X-Gm-Message-State: AOJu0YzQJ44xNxvSE+Tyx3vyWDRdYnhVGyonHbckDQFUkRDQxUSKCdyb RVMazxmUcm2h+a0dvezw3CwYslJCayoFAw== X-Google-Smtp-Source: AGHT+IGS8Kuy/ju4nEVMkK7XwMCVTBXceutAC5IWk26PdSo/bn39i2Mw4mKv0hrSMgkVGu+NgS8odA== X-Received: by 2002:a50:d741:0:b0:54c:4fec:fc with SMTP id i1-20020a50d741000000b0054c4fec00fcmr1197996edj.139.1702036411155; Fri, 08 Dec 2023 03:53:31 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g6-20020a056402090600b0054c9211021csm712424edz.69.2023.12.08.03.53.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 03:53:30 -0800 (PST) Message-ID: <31685a8dadad82f6b7a217149599f639fff0d99b.1702036387.git.liliana.prikler@gmail.com> In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 8 Dec 2023 12:16:55 +0100 MIME-Version: 1.0 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/emacs-xyz.scm (emacs-org)[#:phases]: Wrap ‘build’ in a directory excursion to the actual lisp directory. Change-Id: Ifa10f9e91fe21cd4c34da11b68ddb77a03d847ca --- gnu/packages/emacs-xyz.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 9bb07663ee..80b3136284 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -16461,6 +16461,10 @@ (define-public emacs-org (substitute* "testing/lisp/test-org.el" (("test-org/org-(encode-time|time-string-to-time) .*" all) (string-append all " (skip-unless nil)\n"))))) + (replace 'build + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'build) args)))) (replace 'install (lambda _ (let ((elpa (elpa-directory #$output)) From patchwork Fri Dec 8 11:45:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 57376 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 3752427BBE9; Fri, 8 Dec 2023 11:54:06 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 99C8727BBE2 for ; Fri, 8 Dec 2023 11:54:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBZQV-0003hJ-Tl; Fri, 08 Dec 2023 06:53:51 -0500 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 1rBZQT-0003gv-OK for guix-patches@gnu.org; Fri, 08 Dec 2023 06:53:49 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBZQT-0004uE-Cw for guix-patches@gnu.org; Fri, 08 Dec 2023 06:53:49 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBZQg-0004TK-28 for guix-patches@gnu.org; Fri, 08 Dec 2023 06:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67260] [PATCH v4 5/5] gnu: emacs-magit: Fix native builds. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 08 Dec 2023 11:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67260@debbugs.gnu.org Cc: Mekeor Melire , Josselin Poiret , cox.katherine.e+guix@gmail.com, andrew@trop.in Received: via spool by 67260-submit@debbugs.gnu.org id=B67260.170203643217155 (code B ref 67260); Fri, 08 Dec 2023 11:54:02 +0000 Received: (at 67260) by debbugs.gnu.org; 8 Dec 2023 11:53:52 +0000 Received: from localhost ([127.0.0.1]:44017 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBZQW-0004Sc-0G for submit@debbugs.gnu.org; Fri, 08 Dec 2023 06:53:52 -0500 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:43020) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBZQU-0004Ry-D3 for 67260@debbugs.gnu.org; Fri, 08 Dec 2023 06:53:50 -0500 Received: by mail-ed1-x544.google.com with SMTP id 4fb4d7f45d1cf-54dca2a3f16so3313887a12.0 for <67260@debbugs.gnu.org>; Fri, 08 Dec 2023 03:53:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702036412; x=1702641212; darn=debbugs.gnu.org; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=UzXt/e4HSCpriM108i6H9pFBxue4UPFA9EuDwSzhcOE=; b=ZGBju4MuUZ7U9oPW8OsQPdakRviM4ZznU9joqnbggL1fNFskNjXlyQjYMcXXB4JEMz GenK7y+nGU4BOrRJ6O1hpIBybUJe8USqdKi3DgjZn6NPWMvWc5VJWVUjUeo4X3/lD5Dx F6mMiTKPXYDI6MMXaQ6XlJl+abb/vkIPE+3fpx9rbQoBKulte+hUW6vc9WXdCUaDs3FY auy38TlvLNglNDpUYPz2cJ62F/rv/js1DXwefAUtxlha+2jDHC9K0IHZkG/7UsJEqUpA V3Z0C0fILjIKeV+iEgoGAFQ8u0VFkRA5ff787cY1m8nIoTwmpckYg/1NIHO9cwQxVvEc OXkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702036412; x=1702641212; h=cc:to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UzXt/e4HSCpriM108i6H9pFBxue4UPFA9EuDwSzhcOE=; b=mzUTjhdwxjOyt1T83GVl9TPDJ905UceTYAEy/YTjEIFdGoRqqO4J8qEhKWNI33eita qPvb3JIZeYF50i1K/vF38zycQof16037320silT/fGqaXxSvRkiFSsjZQBjIWySnZPCP 1AfyePQvhjX6q5+3UTLXXWPWOwlRLxXHwfRCBkfV8duELSwgR03ZrOxoXz2A4+a+TIYc N8pww2pDNoaBiXM8s2DxmUhncQXArQs9D1T/OndHVGHm3b8CbKTcwJwt6eUr35ClXzUW Fi/YUlAEPAZ1ZgZT4x+q3RRcS84xLkGX5SWajeebVhLMQTn9qjDySA9PK1dg9wGt7epf RN+w== X-Gm-Message-State: AOJu0YwsmyvVICF0Blk8ISI5xHC22EYRCoxftPT+X31OFMqF+a+KXkw0 Pebk/xDLOi91U9hSOkmVsFgMbXMjpfRUbg== X-Google-Smtp-Source: AGHT+IFuaO8oeyGXl0ytsyAUqldDIgwPL1Ki3eaWjPCqoYmtbgKRde7O3w3P2nJUUJY6nAiz53kjeQ== X-Received: by 2002:a17:907:270f:b0:a1e:a558:748c with SMTP id w15-20020a170907270f00b00a1ea558748cmr773894ejk.18.1702036411845; Fri, 08 Dec 2023 03:53:31 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g6-20020a056402090600b0054c9211021csm712424edz.69.2023.12.08.03.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Dec 2023 03:53:31 -0800 (PST) Message-ID: <9fc90ad975d9a3e5180259ec29a62013a4d16d17.1702036387.git.liliana.prikler@gmail.com> In-Reply-To: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> References: <84c0bc8c4e65af2241b9dd15f494fdc7eedd83d1.1702036387.git.liliana.prikler@gmail.com> From: Liliana Marie Prikler Date: Fri, 8 Dec 2023 12:45:23 +0100 MIME-Version: 1.0 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/emacs-xyz.scm (emacs-magit)[#:phases]: Also wrap ‘build’ in a directory excursion. Change-Id: I332325989a1bbaa95552c2cbf50f336f0075c1c4 --- gnu/packages/emacs-xyz.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 80b3136284..1655dee647 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -1566,7 +1566,11 @@ (define-public emacs-magit (replace 'install (lambda args (with-directory-excursion "lisp" - (apply (assoc-ref %standard-phases 'install) args))))))) + (apply (assoc-ref %standard-phases 'install) args)))) + (replace 'build + (lambda args + (with-directory-excursion "lisp" + (apply (assoc-ref %standard-phases 'build) args))))))) (native-inputs (list texinfo)) (inputs