From patchwork Fri Aug 5 03:29:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41455 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 6114327BBE9; Tue, 9 Aug 2022 19:56:34 +0100 (BST) 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 72DAD27BBEB for ; Tue, 9 Aug 2022 19:56:33 +0100 (BST) Received: from localhost ([::1]:56402 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLUP2-0005Wb-K9 for patchwork@mira.cbaines.net; Tue, 09 Aug 2022 14:56:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38946) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLUKg-0000ow-NP for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLUKg-00025c-BZ for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLUKg-0003Tb-8Z for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH 1/6] gnu: Parameterize libgccjit. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 18:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.166007111113314 (code B ref 57086); Tue, 09 Aug 2022 18:52:02 +0000 Received: (at 57086) by debbugs.gnu.org; 9 Aug 2022 18:51:51 +0000 Received: from localhost ([127.0.0.1]:45003 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKU-0003Sf-RW for submit@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:51 -0400 Received: from mail-ej1-f68.google.com ([209.85.218.68]:43954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKP-0003Rv-KM for 57086@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:48 -0400 Received: by mail-ej1-f68.google.com with SMTP id gb36so23751493ejc.10 for <57086@debbugs.gnu.org>; Tue, 09 Aug 2022 11:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=XzSdnoGDviNl3uJmf3Mz2oEVlIzkTR2qaseS560II9Q=; b=qE6KZ1vNeTNQSDZ5cXkMP8LMBOgIuJ76SWnHghrFkIB9EtKRdacWkj3sWBlhJOVktm 1xHx0n8O4oC/QKjFR4sQDViLI6ZqV65dzkT6NVoJ21uElZwkqROHIZakFxH6IgMblPz4 RvY6DEZP3CTtZUNhIbtNREMtADk4b9JPfeMeJV0ihNyvz3Fb6oGzGazLkqD71HlRTJXq 4R7Z1dgeYoO+WoYyCZIDB2In9N7mxig9PLhxctASr8r+UQzOfJFZ9HdUvyHhhngU0ivG xH7TEpFS7uRVfzNSeoslk9Cpt8XS57tUXlVtevJ6wUfuYj27Fz9bRXf3aPHTRBwLG2+8 7SNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=XzSdnoGDviNl3uJmf3Mz2oEVlIzkTR2qaseS560II9Q=; b=Ri6QrdtQQWmc1s1opsShBRKLNWgRb/CJTe0sOff5sGdA8oGQ55mfvgqZU/Hzd5ipMf MbkikiVw7GWtE+8u08etwhOjZkqNqvoACyha7iQfuozPyF5rjpjfKqPIZ+T3ACDfcAl2 dhlzxO1eee+KWhZ/FyHQSq2uAWlCDhChGnicWfJWOJVgPYO9AyYh0ytNMqNvd+FzEr9V 1tGSonfMrN4hw8z3OBGTt/UTmdEmk3Km37QKBglIN8IZ54J/1nuhxLCjBiYyVqaaOsnm 8us36VTosYCSEZk+8XlXFUivFjuw4rUwBHI7MMohXNW78vXTZdVo37GIpUH6odvNhwLf wbQA== X-Gm-Message-State: ACgBeo30vPeWQ0m1BKpSI13TgKfyRNmGmlQqGAlgpfpx7wOyLnZHt2Xv tAM6db19k6qrod8PssVkrY/RjgBGR+Y= X-Google-Smtp-Source: AA6agR7GuGaOZa9adhDLepGSRoATxfF2axvf4FUVP1SVNELDQScDLpGYOrd3nC3LxP6TokbLV6KU3Q== X-Received: by 2002:a17:906:4fc4:b0:6da:b4c6:fadb with SMTP id i4-20020a1709064fc400b006dab4c6fadbmr18325246ejw.282.1660071099600; Tue, 09 Aug 2022 11:51:39 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x24-20020a170906149800b00705cdfec71esm1422023ejc.7.2022.08.09.11.51.39 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:51:39 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 5 Aug 2022 05:29:58 +0200 Message-ID: <77ce1e3ecbd6b616cda3d0265401d890420e9fac.camel@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gcc.scm (make-libgccjit): New variable. (libgccjit): Define in terms of make-libgccjit. --- gnu/packages/gcc.scm | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4c496e31b2..66f0766646 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -968,31 +968,33 @@ (define-public gdc-11 (custom-gcc gcc-11 "gdc" '("d") %generic-search-paths))) -(define-public libgccjit +(define-public (make-libgccjit gcc) (package - (inherit gcc-9) + (inherit gcc) (name "libgccjit") (outputs (delete "lib" (package-outputs gcc))) (properties (alist-delete 'hidden? (package-properties gcc))) (arguments - (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) - (guix build utils) - (ice-9 regex) - (srfi srfi-1) - (srfi srfi-26)) - ,@(package-arguments gcc)) + (substitute-keyword-arguments (package-arguments gcc) + ((#:modules _ '()) + '((guix build gnu-build-system) + (guix build utils) + (ice-9 regex) + (srfi srfi-1) + (srfi srfi-26))) ((#:configure-flags flags) - `(append `("--enable-host-shared" - ,(string-append "--enable-languages=jit")) + #~(cons* "--enable-host-shared" + "--enable-languages=jit" (remove (cut string-match "--enable-languages.*" <>) - ,flags))) + #$flags))) ((#:phases phases) - `(modify-phases ,phases - (add-after 'install 'remove-broken-or-conflicting-files - (lambda* (#:key outputs #:allow-other-keys) - (for-each delete-file - (find-files (string-append (assoc-ref outputs "out") "/bin") - ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))) + #~(modify-phases #$phases + (add-after 'install 'remove-broken-or-conflicting-files + (lambda* (#:key outputs #:allow-other-keys) + (for-each delete-file + (find-files + (string-append (assoc-ref outputs "out") "/bin") + ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))) (synopsis "GCC library generating machine code on-the-fly at runtime") (description "This package is part of the GNU Compiler Collection and provides an @@ -1003,6 +1005,8 @@ (define-public libgccjit compilers. The just-in-time (jit) part of the name is now something of a misnomer."))) +(define-public libgccjit (make-libgccjit gcc-9)) + (define (make-gccgo gcc) "Return a gccgo package based on GCC." (let ((gccgo (custom-gcc gcc "gccgo" '("go") %generic-search-paths))) From patchwork Fri Aug 5 18:27:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41454 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 1D39927BBEA; Tue, 9 Aug 2022 19:56:24 +0100 (BST) 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 E3DED27BBE9 for ; Tue, 9 Aug 2022 19:56:23 +0100 (BST) Received: from localhost ([::1]:55740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLUOt-00052E-2e for patchwork@mira.cbaines.net; Tue, 09 Aug 2022 14:56:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLUKh-0000oz-Fc for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55265) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLUKg-00025i-Ri for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLUKg-0003Tj-NR for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH 2/6] gnu: libgccjit: Build with bootstrapped gcc. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 18:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.166007111113321 (code B ref 57086); Tue, 09 Aug 2022 18:52:02 +0000 Received: (at 57086) by debbugs.gnu.org; 9 Aug 2022 18:51:51 +0000 Received: from localhost ([127.0.0.1]:45005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKV-0003Sh-5S for submit@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:51 -0400 Received: from mail-ej1-f66.google.com ([209.85.218.66]:36631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKP-0003Rw-MF for 57086@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:48 -0400 Received: by mail-ej1-f66.google.com with SMTP id m4so23814272ejr.3 for <57086@debbugs.gnu.org>; Tue, 09 Aug 2022 11:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=bCIzj+ror8YlNu72+oeekvH/F/DwMhMwPGUSWQsjJO0=; b=c3/Ef2O1x5RcSN9V9WDdoV+wDgm2HRsOJstPXpFrxCT/5TVwYlW/pxX7W/LDQyisPR eYF9y3I7gkXpecEBA9JDbiRq9gj14JSAdB3S5xXfZi5le5KEgTn21p50nuz1my57Ig0M o1Upmwtz+3eYONVzogwAeV2RiDuHHkDlswZ+HObkSS/qhhMmVFdOrYxkerRQ/LByC0KY r86HhFpFOz+JEqQ/NWvUH+YSSam4GO5zRiXhAcWHhALAMTB6IUZya0usluGGD7QCg2YL v0B6U/Y4P5Yowmtc9OcpSib6kiOSt62SpfJK9A/t1JM52Ig5miToOd1msnTLJDfmOeZz 5oTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=bCIzj+ror8YlNu72+oeekvH/F/DwMhMwPGUSWQsjJO0=; b=0agRYh45brcHdHq4SGzFj5DyQ7JZh5Ahx8Z1wiNaFvGAHPdVCnA4lh7CdyymaEuekt xsQMgaoMH4CcZWhZH53U4qZ2mGPHspEUFygRyvsFPRACBT5i5ZFXAlR4hNm6aMJUiptx ewrg0WPFrlcipSki47e7feHJQ9Bff3v9LV+tOisJEEYFg3iziPLC1xD4bCmBgLUyw3t2 5YFFl2BfCrk25CAQKaiOnuwfZUs/tkJCGvfEPn86I0iHwMYVmWzQf+fuXDaBeUqGNNTL 1GvDbY2fBQn0wjYs3FmFUl5NoWZIi1vzO+B5zlcHaoCRt6O5VMpXtoUQZYvW1zdkEtS7 rHDQ== X-Gm-Message-State: ACgBeo3QqGB1mwvqPZmoeqNXDmZxQGgX/PFXHTbs7IgoSjrD3uo5KQ6R pZ9hXnvsKsnzE/xY5FNnkYp/pXtHfN8= X-Google-Smtp-Source: AA6agR5TIjpTjIEYausC7Tg3nLRDFSXbxUmhSl9aEd8S3vJlpGHPlRcWJ8LuzMBXagnbm6s1sZYSNA== X-Received: by 2002:a17:907:1df1:b0:730:b058:ef95 with SMTP id og49-20020a1709071df100b00730b058ef95mr17765508ejc.600.1660071100078; Tue, 09 Aug 2022 11:51:40 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x24-20020a170906149800b00705cdfec71esm1422023ejc.7.2022.08.09.11.51.39 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:51:39 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 5 Aug 2022 20:27:48 +0200 MIME-Version: 1.0 Message-ID: <9bd28a5e3c55001cfc6caec1dbbd9d79dfa7a6a7.camel@gmail.com> 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/gcc.scm (make-libgccjit)[#:configure-flags]: Add “--disable-bootstrap”, “--disable-libatomic”, “--disable-libgomp”, “--disable-libquadmath”, “--disable-libssp”, and “--enable-checking=release”. [inputs]: Remove libstdc++. [native-inputs]: Add gcc. --- gnu/packages/gcc.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 66f0766646..4f7076d977 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -983,7 +983,13 @@ (define-public (make-libgccjit gcc) (srfi srfi-1) (srfi srfi-26))) ((#:configure-flags flags) - #~(cons* "--enable-host-shared" + #~(cons* "--disable-bootstrap" + "--disable-libatomic" + "--disable-libgomp" + "--disable-libquadmath" + "--disable-libssp" + "--enable-host-shared" + "--enable-checking=release" "--enable-languages=jit" (remove (cut string-match "--enable-languages.*" <>) #$flags))) @@ -995,6 +1001,10 @@ (define-public (make-libgccjit gcc) (find-files (string-append (assoc-ref outputs "out") "/bin") ".*(c\\+\\+|cpp|g\\+\\+|gcov|gcc|gcc-.*)")))))))) + (inputs (modify-inputs (package-inputs gcc) + (delete "libstdc++"))) + (native-inputs (modify-inputs (package-native-inputs gcc) + (prepend gcc))) (synopsis "GCC library generating machine code on-the-fly at runtime") (description "This package is part of the GNU Compiler Collection and provides an From patchwork Fri Aug 5 18:30:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41453 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 A240527BBEA; Tue, 9 Aug 2022 19:56:23 +0100 (BST) 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 77CD827BBE9 for ; Tue, 9 Aug 2022 19:56:23 +0100 (BST) Received: from localhost ([::1]:55708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLUOs-00050y-L2 for patchwork@mira.cbaines.net; Tue, 09 Aug 2022 14:56:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38968) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLUKi-0000pC-1v for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55266) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLUKh-00025m-FW for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLUKh-0003Tr-67 for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH 3/6] gnu: libgccjit: Build multiple versions. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 18:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.166007111113329 (code B ref 57086); Tue, 09 Aug 2022 18:52:03 +0000 Received: (at 57086) by debbugs.gnu.org; 9 Aug 2022 18:51:51 +0000 Received: from localhost ([127.0.0.1]:45007 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKV-0003So-Fu for submit@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:51 -0400 Received: from mail-ej1-f65.google.com ([209.85.218.65]:37411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKQ-0003Rz-4P for 57086@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:49 -0400 Received: by mail-ej1-f65.google.com with SMTP id kb8so23819188ejc.4 for <57086@debbugs.gnu.org>; Tue, 09 Aug 2022 11:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=Ot33SzhNcS5g0fIpxPll0kciFq8pc0B/A7EjYj5tUhs=; b=PBQz7vp9H8oOsX6nnXIIXwj6T/mpDdOutod8CV0yxIIpMzIp3SR0QzLONR3NvADo4G TAFD47RoUaz00r2Pcnf2DMhnPk4dJ5lbNTR0jbnJNT2Di9dQF+EuNSUnBw+a6ugmwQZ3 v4qd4DTA6JZ+SQduGL5/30JONpp9kKpNxTu4py13CLMi/T8VTDwhOofYaaVgAxxPSJ2E K3hyLsjjEl9F9zFLc0cQm93bqv+Cvgh5oMleRTFD/72/R9ZOk2iqGg5621CN1h2Zs1K1 49N+M1IHGyHnDKVACB7MVr+RApDr0FeM81fV/Yo578fClZDJGoVQOjH4ixYuqdy45hMM 4tew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=Ot33SzhNcS5g0fIpxPll0kciFq8pc0B/A7EjYj5tUhs=; b=euMGtJ0ZRps8T8IRvN+dD97hxpO+3eS4vNw8T9tgPayljXtYcj7m+Wg/31A6ur5Ura T4BwUpE9VC66Wo7GagDJA52Qa8B5vA1hdDB7p4yBQgf889XM0rvcwdJ2dFk2bDhXmwZi e4N20p1mBzQaIwLyyQQ4Uqc2NDYiZ2/vxfKAMh/pltrOHw7s6i8RQW8JZ5/fLzO0FBS+ NZ38tyHrtoz99VaDjN/GrQNtic9+S6uS5p0yMiF2YkgC/bFx+uzQoOTaxs2UWtqvGM1f jMTMQpkfRGH2i1c2ad9LQsg+OnFpxPEqK94oghad+mM1osaRPcNuHmHPqDZMVw8hMtS2 OdkQ== X-Gm-Message-State: ACgBeo1f3+HQSW4wbr2HQUJR9IpNRgzbBpLfXzgtDWhMS7GAQXN6FC8O 90BIy9FLyt6NSblKi3QdivFjrXMFHMM= X-Google-Smtp-Source: AA6agR5XHFLbYcMhFAqYFTtgmRLbWlXtozNN6bV1SPZ36+Mv+sHTJ18hkrkh1Pedy3OCaTafKlVcVQ== X-Received: by 2002:a17:907:3e29:b0:730:9d82:5113 with SMTP id hp41-20020a1709073e2900b007309d825113mr18625512ejc.29.1660071100564; Tue, 09 Aug 2022 11:51:40 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x24-20020a170906149800b00705cdfec71esm1422023ejc.7.2022.08.09.11.51.40 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:51:40 -0700 (PDT) From: Liliana Marie Prikler Date: Fri, 5 Aug 2022 20:30:01 +0200 Message-ID: <04386956d3919e7021159ab5e77e99965ee33e1b.camel@gmail.com> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gcc.scm (libgccjit-9, libgccjit-10, libgccjit-11) (libgccjit-12): New variables. (libgccjit): Update to libgccjit-10. --- gnu/packages/gcc.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 4f7076d977..7e4fb283d8 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -1015,7 +1015,12 @@ (define-public (make-libgccjit gcc) compilers. The just-in-time (jit) part of the name is now something of a misnomer."))) -(define-public libgccjit (make-libgccjit gcc-9)) +(define-public libgccjit-9 (make-libgccjit gcc-9)) +(define-public libgccjit-10 (make-libgccjit gcc-10)) +(define-public libgccjit-11 (make-libgccjit gcc-11)) +(define-public libgccjit-12 (make-libgccjit gcc-12)) + +(define-public libgccjit libgccjit-10) (define (make-gccgo gcc) "Return a gccgo package based on GCC." From patchwork Fri Aug 5 22:37:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41451 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 7DA2727BBEA; Tue, 9 Aug 2022 19:52:24 +0100 (BST) 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,URIBL_BLOCKED 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 D929327BBE9 for ; Tue, 9 Aug 2022 19:52:23 +0100 (BST) Received: from localhost ([::1]:50236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLUL0-0000vl-OE for patchwork@mira.cbaines.net; Tue, 09 Aug 2022 14:52:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLUKj-0000pN-1W for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55269) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLUKi-000265-GJ for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLUKi-0003UJ-Ck for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH 4/6] gnu: emacs: Build with native compilation. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 18:52:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.166007112313389 (code B ref 57086); Tue, 09 Aug 2022 18:52:04 +0000 Received: (at 57086) by debbugs.gnu.org; 9 Aug 2022 18:52:03 +0000 Received: from localhost ([127.0.0.1]:45014 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKg-0003Th-GP for submit@debbugs.gnu.org; Tue, 09 Aug 2022 14:52:03 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:46619) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKQ-0003S0-Ni for 57086@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:52 -0400 Received: by mail-ej1-f67.google.com with SMTP id y13so23721492ejp.13 for <57086@debbugs.gnu.org>; Tue, 09 Aug 2022 11:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=vIXn1YTjWBV2dpJfjS++khohfmDXUIxnzjr1/K22k38=; b=Jmq1mSHVbU9k2LSSkRfA8ysfOaGGvE+LvqoxcQy47DdSHSCEZs7Mo0s0CZmF/lfoEK tMYBbLnSXElQtChZHhfzoJIgbtV0aOEdnu7BIZLiojIyP44ifSQdz28FzIqejoBCNiSA 1KtrwcaIMpJ8qtY4AwaX3UzBIqneqrGJJ3zweH4SopUM3oSCQjt2UZGIH88BRFkjChPU Cne7kr03SGE0mtoKkKzJwUD2aegljKcvwtBxU3+jsCjjNIOQtlzLqWIgNIIn1KgOgrsJ I50JMgzvVZQgo9i4D4DI3tFRTYrgYbvFEP/+P46cUUofXba9nJanAEdWkH+L8Xn660li YoAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=vIXn1YTjWBV2dpJfjS++khohfmDXUIxnzjr1/K22k38=; b=xwkOBq50qFMkTRR49Gikpue30zVJVVdTp3Nqo5TIsVxr259n6xWQWWRWRN6iw8CX2F uWtOtDyXS4C5dkQZXXg0B2mfqugWDca2l98G6PSbLS6wiyGYC47MYSZxTzT3VICDngS0 56YMp+hZDZmfWO6/j0g2vT6mfJ990sqCmg9JPUnIRbg/9UZ2c+/B0wjpGms2y7Gmwmy/ /82glggxcVLokD+5b2gFlziU4mGfQjdLva2hT3/dd78Y1fegrd8SqKA0IRxCgxVpCcV5 n0H2EexE4L9q0dKpOUcOrVD9eh0FDb7ZI3q6IU1fKPSAXcUqtZuXAFXx3xuCYNjwzKGX KuYg== X-Gm-Message-State: ACgBeo3Pt1WwzcptakMShw6nqUq2O1kePk8mfMs1CnE98PN9daX7gIgG 2oo4njNsbYEP8+sv613sW91brDzSGnA= X-Google-Smtp-Source: AA6agR7/LvDdki5eBukgutRJ8y4n00qKsfIWQ5Ybxd3icfZPFIuZBckgzBiT9Glgm55yU2IfyaLMUw== X-Received: by 2002:a17:907:b0d:b0:730:aa17:a0b7 with SMTP id h13-20020a1709070b0d00b00730aa17a0b7mr18166190ejl.661.1660071101073; Tue, 09 Aug 2022 11:51:41 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x24-20020a170906149800b00705cdfec71esm1422023ejc.7.2022.08.09.11.51.40 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:51:40 -0700 (PDT) From: Liliana Marie Prikler Date: Sat, 6 Aug 2022 00:37:43 +0200 MIME-Version: 1.0 Message-ID: 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.scm (%emacs-modules): New variable. (emacs)[arguments]<#:modules>: Use it here. <#:configure-flags> Add “--with-native-compilation”. <#:make-flags>: Add “NATIVE_FULL_AOT=1”. <#:phases>: Add ‘set-libgccjit-path’ and ‘patch-compilation-driver’. [inputs]: Add explicit ld-wrapper, binutils, glibc, and libgccjit. (emacs-minimal, emacs-xwidgets, emacs-no-x) (emacs-no-x-toolkit): Adjust accordingly. --- gnu/packages/emacs.scm | 64 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/gnu/packages/emacs.scm b/gnu/packages/emacs.scm index ffd1eda08e..68afdb0446 100644 --- a/gnu/packages/emacs.scm +++ b/gnu/packages/emacs.scm @@ -45,6 +45,7 @@ (define-module (gnu packages emacs) #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix build-system glib-or-gtk) #:use-module (gnu packages) @@ -55,6 +56,7 @@ (define-module (gnu packages emacs) #:use-module (gnu packages fontutils) #:use-module (gnu packages freedesktop) #:use-module (gnu packages fribidi) + #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) @@ -81,6 +83,13 @@ (define-module (gnu packages emacs) #:use-module (ice-9 match) #:use-module (srfi srfi-1)) +(define (%emacs-modules build-system) + (let ((which (build-system-name build-system))) + `((guix build ,(symbol-append which '-build-system)) + (guix build utils) + (srfi srfi-1) + (ice-9 ftw)))) + (define-public emacs (package (name "emacs") @@ -129,11 +138,33 @@ (define-public emacs (arguments (list #:tests? #f ; no check target + #:modules (%emacs-modules build-system) #:configure-flags #~(list "--with-modules" "--with-cairo" + "--with-native-compilation" "--disable-build-details") + #:make-flags #~(list "NATIVE_FULL_AOT=1") #:phases #~(modify-phases %standard-phases + (add-after 'set-paths 'set-libgccjit-path + (lambda* (#:key inputs #:allow-other-keys) + (define (first-subdirectory/absolute directory) + (let ((files (scandir + directory + (lambda (file) + (and (not (member file '("." ".."))) + (file-is-directory? (string-append + directory "/" + file))))))) + (and (not (null? files)) + (string-append directory "/" (car files))))) + (let* ((libgccjit-libdir + (first-subdirectory/absolute ;; version + (first-subdirectory/absolute ;; host type + (search-input-directory inputs "lib/gcc"))))) + (setenv "LIBRARY_PATH" + (string-append (getenv "LIBRARY_PATH") + ":" libgccjit-libdir))))) (add-after 'unpack 'enable-elogind (lambda _ (substitute* "configure.ac" @@ -164,6 +195,20 @@ (define-public emacs (("\\(tramp-compat-process-running-p \"(.*)\"\\)" all process) (format #f "(or ~a (tramp-compat-process-running-p ~s))" all (string-append "." process "-real")))))) + (add-after 'unpack 'patch-compilation-driver + (lambda _ + (substitute* "lisp/emacs-lisp/comp.el" + (("\\(defcustom native-comp-driver-options nil") + (format + #f "(defcustom native-comp-driver-options '(~@{~s~^ ~})" + (string-append + "-B" #$(this-package-input "binutils") "/bin/") + (string-append + "-B" #$(this-package-input "glibc") "/lib/") + (string-append + "-B" #$(this-package-input "libgccjit") "/lib/") + (string-append + "-B" #$(this-package-input "libgccjit") "/lib/gcc/")))))) (add-before 'configure 'fix-/bin/pwd (lambda _ ;; Use `pwd', not `/bin/pwd'. @@ -256,6 +301,14 @@ (define* (emacs-byte-compile-directory dir) (list gnutls ncurses + ;; To "unshadow" ld-wrapper in native builds + (make-ld-wrapper "ld-wrapper" #:binutils binutils) + + ;; For native compilation + binutils + glibc + libgccjit + ;; Required for "core" functionality, such as dired and compression. coreutils gzip @@ -377,12 +430,16 @@ (define-public emacs-minimal (arguments (substitute-keyword-arguments (package-arguments emacs) ((#:configure-flags flags #~'()) - #~(list "--with-gnutls=no" "--disable-build-details")) + #~(list "--with-gnutls=no" "--with-native-compilation" + "--disable-build-details")) + ((#:modules _) (%emacs-modules build-system)) ((#:phases phases) #~(modify-phases #$phases (delete 'restore-emacs-pdmp) (delete 'strip-double-wrap))))) - (inputs (list ncurses coreutils gzip)) + (inputs (list ncurses coreutils gzip + (make-ld-wrapper "ld-wrapper" #:binutils binutils) + binutils glibc libgccjit zlib)) (native-inputs (list autoconf pkg-config)))) (define-public emacs-xwidgets @@ -395,6 +452,7 @@ (define-public emacs-xwidgets (substitute-keyword-arguments (package-arguments emacs) ((#:configure-flags flags #~'()) #~(cons "--with-xwidgets" #$flags)) + ((#:modules _) (%emacs-modules build-system)) ((#:phases phases) #~(modify-phases #$phases (delete 'restore-emacs-pdmp) @@ -419,6 +477,7 @@ (define-public emacs-no-x (substitute-keyword-arguments (package-arguments emacs) ((#:configure-flags flags #~'()) #~(delete "--with-cairo" #$flags)) + ((#:modules _) (%emacs-modules build-system)) ((#:phases phases) #~(modify-phases #$phases (delete 'restore-emacs-pdmp) @@ -437,6 +496,7 @@ (define-public emacs-no-x-toolkit (substitute-keyword-arguments (package-arguments emacs) ((#:configure-flags flags #~'()) #~(cons "--with-x-toolkit=no" #$flags)) + ((#:modules _) (%emacs-modules build-system)) ((#:phases phases) #~(modify-phases #$phases (delete 'restore-emacs-pdmp) From patchwork Tue Aug 9 18:26:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41452 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 4457927BBEA; Tue, 9 Aug 2022 19:53:48 +0100 (BST) 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 0050727BBE9 for ; Tue, 9 Aug 2022 19:53:48 +0100 (BST) Received: from localhost ([::1]:51194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLUMN-0001db-2g for patchwork@mira.cbaines.net; Tue, 09 Aug 2022 14:53:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLUKi-0000pD-1w for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55267) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLUKh-00025o-N3 for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLUKh-0003U4-JY for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH 5/6] guix: emacs-utils: Add emacs-compile-directory. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 18:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.166007111213336 (code B ref 57086); Tue, 09 Aug 2022 18:52:03 +0000 Received: (at 57086) by debbugs.gnu.org; 9 Aug 2022 18:51:52 +0000 Received: from localhost ([127.0.0.1]:45009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKV-0003Sv-Q5 for submit@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:52 -0400 Received: from mail-ed1-f68.google.com ([209.85.208.68]:44697) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKR-0003S2-BM for 57086@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:49 -0400 Received: by mail-ed1-f68.google.com with SMTP id t5so16226782edc.11 for <57086@debbugs.gnu.org>; Tue, 09 Aug 2022 11:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:to:content-transfer-encoding:message-id :mime-version; bh=/INyg+1eMQ8AHSX1C7bx4VZv/ingHjQkWmWyGlm0PHI=; b=AsVZJlkvrHqPhzV4QI7nlsbJzlBPA4XL9JsQGeaqwS9kzEyEfA6Bw9ZwyyZKi/cVQY Ck1R79zOIqth9GCjkwNUmgj6kExAWaNQAS9vGoww75E0eE1nWAXqM1L8LPxA7DvI44K5 YVhaYmZa5GvM0/4y15MQWmm/67h5+VDfCdxjp3Z67ULJ/yjo5HtzaEWT04uh3fkSMfrk dosBAXHgxQHlcmdhoOq9/BL3xOJhimp9y77rZ956KmmkHjEx2sQsZsD7cGrZpCTgwomX jRpOXgmqJFNALANx4RZsTmMFbhFRFxVLwJKDbrTCT89XoUSf8X4Mix1niS7zA/AwtuJ/ inrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:to:content-transfer-encoding :message-id:mime-version; bh=/INyg+1eMQ8AHSX1C7bx4VZv/ingHjQkWmWyGlm0PHI=; b=yEGsygzr5AettLN8AuBqfM8o40nOe+mDmZEaZKRU2MZ4WYtJm/CTFNzkwArNDifdzC 9a0kEd3q0BgwNV3FxXSLOWCVY9I+msPfcXLQ33UTU94vJOi4ZDaby6IrFKRhWppdWVg0 JFmMdrjov2ftyXv3E0IPcDUS6eQsL3n6OU8PcIBBPqoY8FOjnex1lsqI6gWHFJXuCvBa m9RS1Jiszwug6GeXU15g3qAkjU1wEQxCO46ug7BxkGwQ5yD1e+5v55pOJMVIektMTN74 uklqoVo0Wum+W/Nzpt+gef9UQD5U6sTreahAhAmTwaUV0mPLeeRW+86SBQ4Nhxf/nnNU qv4A== X-Gm-Message-State: ACgBeo2tCdbjxA9dRM4FWvLzIA/N7WoSQz4JRqCho4pDJReRhCpBuR8H 8quC+imJ/vFsBZbxV1ynHG7TuD+vN4k= X-Google-Smtp-Source: AA6agR4JJYPn8K0Y21i2UWp8EzUyF/EAr36M1daZaquYB4nYfTwpNjC0YnJ4xfoSgFh7RMAfrrt+bg== X-Received: by 2002:a50:ee85:0:b0:43d:3e0:6157 with SMTP id f5-20020a50ee85000000b0043d03e06157mr23495229edr.19.1660071101584; Tue, 09 Aug 2022 11:51:41 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x24-20020a170906149800b00705cdfec71esm1422023ejc.7.2022.08.09.11.51.41 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:51:41 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 9 Aug 2022 20:26:06 +0200 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches * guix/build/emacs-utils.scm (emacs-compile-directory): New variable. --- guix/build/emacs-utils.scm | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/guix/build/emacs-utils.scm b/guix/build/emacs-utils.scm index 8ee547f2b3..17155a0b8b 100644 --- a/guix/build/emacs-utils.scm +++ b/guix/build/emacs-utils.scm @@ -38,6 +38,7 @@ (define-module (guix build emacs-utils) emacs-generate-autoloads emacs-byte-compile-directory + emacs-compile-directory emacs-header-parse as-display @@ -115,6 +116,31 @@ (define* (emacs-byte-compile-directory dir) (byte-recompile-directory (file-name-as-directory ,dir) 0 1)))) (emacs-batch-eval expr))) +(define* (emacs-compile-directory dir) + "Compile all files in DIR to native code. + +If native code is not supported, compile to bytecode instead." + (emacs-batch-eval + `(let ((byte-compile-debug t) ; for proper exit status + (byte+native-compile (native-comp-available-p)) + (files (directory-files-recursively ,dir "\\.el$"))) + (mapc + (lambda (file) + (let (byte-to-native-output-file) + (if byte+native-compile + (native-compile file (concat (file-name-sans-extension file) + ".eln")) + (byte-compile-file file)) + ;; Sadly, we can't use pcase because quasiquote works different in + ;; Emacs. See `batch-byte+native-compile' in comp.el for the + ;; actual shape of byte-to-native-output-file. + (unless (null byte-to-native-output-file) + (rename-file (car byte-to-native-output-file) + (cdr byte-to-native-output-file) + t)))) + files)) + #:dynamic? #t)) + (define (emacs-header-parse section file) "Parse the header SECTION in FILE and return it as a string." (emacs-batch-script From patchwork Tue Aug 9 18:32:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41456 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 3FFC127BBEA; Tue, 9 Aug 2022 19:57:00 +0100 (BST) 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 DE02927BBE9 for ; Tue, 9 Aug 2022 19:56:59 +0100 (BST) Received: from localhost ([::1]:57586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oLUPS-0006Oi-Le for patchwork@mira.cbaines.net; Tue, 09 Aug 2022 14:56:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oLUKi-0000pM-Eq for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55268) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oLUKi-00025z-3l for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oLUKi-0003UB-0F for guix-patches@gnu.org; Tue, 09 Aug 2022 14:52:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH 6/6] build-system: emacs: Use native compilation. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 09 Aug 2022 18:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.166007111213342 (code B ref 57086); Tue, 09 Aug 2022 18:52:03 +0000 Received: (at 57086) by debbugs.gnu.org; 9 Aug 2022 18:51:52 +0000 Received: from localhost ([127.0.0.1]:45011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKW-0003T3-5h for submit@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:52 -0400 Received: from mail-ej1-f67.google.com ([209.85.218.67]:43956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oLUKR-0003S3-Kn for 57086@debbugs.gnu.org; Tue, 09 Aug 2022 14:51:49 -0400 Received: by mail-ej1-f67.google.com with SMTP id gb36so23751650ejc.10 for <57086@debbugs.gnu.org>; Tue, 09 Aug 2022 11:51:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:date:subject:mime-version:to:content-transfer-encoding :message-id; bh=FsrC9X6VVEpUNisCT3rinGquv2+cOAKy8KJBhOon+m8=; b=IY984cZoXzfF0uhT5ysorRgEJ3+OeOl7JPG5qpgk1cB1Millq2xQb0kd2eQKQhDFCM QGRjwGNBttak5eh3VJ6jVz/+7mKD48nxSxaY6OmD4QugtRuDOzK5Kjp/9eVOcCxg5KSm HhFK0LGJU+L8DxUUZtPK/goMere8YUP3bAXvYj6UgM0E0CAov9rNLxjFLAnZrJUnHGrU 8R67nNRxeAydeA7BMGKPSB0WpMwbS5FODliuNzQiWwRIPnT/Q7q9oduBjEbX4WwvOFXn jcwFNNGh+dzGt0UST6XrjMJ19bb9GUgBRW6QzD+s0TPlhvc8aEgcEcnyfr8REKgeQ+wz wydQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:date:subject:mime-version:to :content-transfer-encoding:message-id; bh=FsrC9X6VVEpUNisCT3rinGquv2+cOAKy8KJBhOon+m8=; b=h7NCnLVCgssWOtIEP4VSCeP4Eqbg07IZd2iDE72dBJGqmy9xCXJ9zWrzmoFttZV4Iw +C7ylw1g5vHBvlzYR8eUMLofjVuJEBfbXLmaqtNqGAofpM7P3oKCchbbwdmczf5KPkUa 7xnvoJamQdJLsaAUb7zlzqIwavptL7NT84ukotPtAaxSgczLzvqh2eVAfCIQead8jpOn 4kuJx5aC3zYdUhykaaNLgZwrsM0cCPeSF9p8ivJLOv+MLSjiUfHixV6uHaWBAB8U6O4L JSTkn6kMRJpIUG5WVlNOb43Ov2XtyJvGDWJ5LIBPWpytx6+waTMKCW2AJdj/V9v6Jkzd EPMg== X-Gm-Message-State: ACgBeo0w+bXF44Qmiyti0PZLerU9XyOlchkP0fBtWpL+1JJuMX9IqJDl 5gGXDctxkQsmYke/Bstg0A2iJt5Uuxc= X-Google-Smtp-Source: AA6agR7h6MOvGYpYCcOCRURTXIBrNtH+rcym/wA+wH9ux5NHyearoG63lTQBpR1jwUjp7D/XcHBEig== X-Received: by 2002:a17:906:84e1:b0:732:1ea0:8b43 with SMTP id zp1-20020a17090684e100b007321ea08b43mr3562502ejb.343.1660071102048; Tue, 09 Aug 2022 11:51:42 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id x24-20020a170906149800b00705cdfec71esm1422023ejc.7.2022.08.09.11.51.41 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Aug 2022 11:51:41 -0700 (PDT) From: Liliana Marie Prikler Date: Tue, 9 Aug 2022 20:32:37 +0200 MIME-Version: 1.0 Message-ID: <76e36854b8ede1216159b68eb1b651f759d75943.camel@gmail.com> 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 * guix/build/emacs-build-system.scm (build): Use ‘emacs-compile-directory’ rather than ‘emacs-byte-compile-directory’. Also delete already compiled files in the working directory prior to compilation. --- guix/build/emacs-build-system.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/build/emacs-build-system.scm b/guix/build/emacs-build-system.scm index 6a6918bfdd..9ecfceccf1 100644 --- a/guix/build/emacs-build-system.scm +++ b/guix/build/emacs-build-system.scm @@ -110,11 +110,14 @@ (define* (expand-load-path #:key (prepend-source? #t) #:allow-other-keys) (define* (build #:key outputs inputs #:allow-other-keys) "Compile .el files." + ;; Ensure that already compiled files in the working directory don't shadow + ;; the build. Might happen, because check runs first. + (for-each delete-file (find-files "." "\\.el[cn]$")) (let* ((emacs (search-input-file inputs "/bin/emacs")) (out (assoc-ref outputs "out"))) (setenv "SHELL" "sh") (parameterize ((%emacs emacs)) - (emacs-byte-compile-directory (elpa-directory out))))) + (emacs-compile-directory (elpa-directory out))))) (define* (patch-el-files #:key outputs #:allow-other-keys) "Substitute the absolute \"/bin/\" directory with the right location in the From patchwork Wed Aug 24 21:59:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 41935 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 C639427BBEA; Thu, 25 Aug 2022 08:26:39 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS autolearn=no 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 3F4CD27BBE9 for ; Thu, 25 Aug 2022 08:26:39 +0100 (BST) Received: from localhost ([::1]:43518 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oR7GA-0005XZ-C1 for patchwork@mira.cbaines.net; Thu, 25 Aug 2022 03:26:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55380) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oR7Eg-0004UU-2g for guix-patches@gnu.org; Thu, 25 Aug 2022 03:25:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oR7Ef-0006M9-PX for guix-patches@gnu.org; Thu, 25 Aug 2022 03:25:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oR7Ef-0000Bu-LW for guix-patches@gnu.org; Thu, 25 Aug 2022 03:25:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57086] [PATCH v3 7/7] gnu: emacs-yasnippet: Fix build. References: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> In-Reply-To: <4c232648145659a2c3edca6d32725d8120cc14d3.camel@gmail.com> Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 25 Aug 2022 07:25:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57086@debbugs.gnu.org Received: via spool by 57086-submit@debbugs.gnu.org id=B57086.1661412292647 (code B ref 57086); Thu, 25 Aug 2022 07:25:05 +0000 Received: (at 57086) by debbugs.gnu.org; 25 Aug 2022 07:24:52 +0000 Received: from localhost ([127.0.0.1]:48757 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR7ES-0000AI-FD for submit@debbugs.gnu.org; Thu, 25 Aug 2022 03:24:52 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:36826) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oR7EG-00008q-6w for 57086@debbugs.gnu.org; Thu, 25 Aug 2022 03:24:40 -0400 Received: by mail-ed1-f67.google.com with SMTP id w10so12787496edc.3 for <57086@debbugs.gnu.org>; Thu, 25 Aug 2022 00:24:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc; bh=9yqhx642D+VQVo3b8vb9UwzIzEzos5Ps67m76WMlY+o=; b=mX4Di95wX2Gg33L8aS6PBsmKSobEsxbIL58bNpKw9H/mfct7hg/J9QBb8n2ZCrcNgg HLPWd4UVSNo4b6v+Co4otMi2WAuuVAstX1kip4MaOUOaC5rr1BxXCkbQu1a3HWrErwZc tL0swoHLleur/46W9FAITDGoiXH44RlYK8xXMRHxEAv+ASnckK3lRdCzuq+JS7WYEL2E iiMCsNp28Rc/gRXrKEqtnyarEdznOA63/Nrysbw0JaTlQQdGgwptQ4Uqr5XKeLIjmU3l BMEO/VPK+MF8ktDqLbeFL29mJkDCEq3EQblMMHiP9gndQycfHoHjAsogiRzW2/fiJU2I roDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc; bh=9yqhx642D+VQVo3b8vb9UwzIzEzos5Ps67m76WMlY+o=; b=uTmvdVlPAckXQkgaEBwZgtE+vJeFKH0Eq9BwtAkL5ZY6Vk20JRC8Ef/QqAwnttITY2 cr5JtFGXk1wtRBuGZ3cgTLO0Yq3YmSFbqfrTGfebGMGSo0zM/CG/nnZe9AfmyZ9UR0gq NV5dDzS0K2AZhkZR4lvEAOTVgHyDW4a8GuWuER/MgGpAm1JxI7yG1fT0Nh0NiEDznviO H0k6+yLFRFnh7MU/Yf/gaTeBW2AGCU05zo8lVdG+nIBCmKeJ7Ezs+O1PFsi5VIP7ZjId qXuzQ7UbXCImc+dZNBWyfkJ4LbAUwx6C6B0R8Ya7QFiHWdkzCAUI5gndjNENvPn7tjfD oqQA== X-Gm-Message-State: ACgBeo1HQiBYPtEVdH1gtPJ+2zz9nL+OhonWJmHeHidmUx3cG4GykHV5 NeVLBAqfUEeLePw7nuuUn0TQP8Q74jg= X-Google-Smtp-Source: AA6agR5hVSpiWq8kGw4FXkItW5vKT/WA3Ba6wBf7O2cF66YBpbpir0xOyB5taPpItLaIdtLq6+baJg== X-Received: by 2002:a05:6402:14e:b0:443:f58:17e9 with SMTP id s14-20020a056402014e00b004430f5817e9mr2148265edu.106.1661412274530; Thu, 25 Aug 2022 00:24:34 -0700 (PDT) Received: from nijino.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id g2-20020a170906538200b0073d62cc3270sm2019690ejo.118.2022.08.25.00.24.33 for <57086@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Aug 2022 00:24:33 -0700 (PDT) From: Liliana Marie Prikler Date: Wed, 24 Aug 2022 23:59:07 +0200 Message-ID: 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/emacs-yasnippet-fix-tests.patch: Handle arguments in buffer-list. --- .../patches/emacs-yasnippet-fix-tests.patch | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/gnu/packages/patches/emacs-yasnippet-fix-tests.patch b/gnu/packages/patches/emacs-yasnippet-fix-tests.patch index 475352d8db..c70cc75d92 100644 --- a/gnu/packages/patches/emacs-yasnippet-fix-tests.patch +++ b/gnu/packages/patches/emacs-yasnippet-fix-tests.patch @@ -9,12 +9,13 @@ Content-Transfer-Encoding: 8bit - Emacs 28 has a new mode ‘lisp-data-mode’ for Lisp data. - A test that was temporarily broken passes again. - The default for ‘org-adapt-indentation’ has changed. +- buffer-list may be called with arguments when native-comp is enabled. --- - yasnippet-tests.el | 41 ++++++++++++++++++++++++++--------------- - 1 file changed, 26 insertions(+), 15 deletions(-) + yasnippet-tests.el | 45 ++++++++++++++++++++++++++++----------------- + 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/yasnippet-tests.el b/yasnippet-tests.el -index b8a7980f..9fadf00c 100644 +index f7ca2bb..7618ab7 100644 --- a/yasnippet-tests.el +++ b/yasnippet-tests.el @@ -1,6 +1,6 @@ @@ -55,7 +56,21 @@ index b8a7980f..9fadf00c 100644 ;; Some org-mode versions leave trailing whitespace, some don't. (delete-trailing-whitespace) (should (equal expected (buffer-string)))))) -@@ -1390,7 +1393,9 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ +@@ -1195,11 +1198,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ + (let ((saved-sym (make-symbol "yas--buffer-list"))) + `(let ((,saved-sym (symbol-function 'buffer-list))) + (cl-letf (((symbol-function 'buffer-list) +- (lambda () ++ (lambda (&rest args) + (cl-remove-if (lambda (buf) + (with-current-buffer buf + (eq major-mode 'lisp-interaction-mode))) +- (funcall ,saved-sym))))) ++ (funcall ,saved-sym args))))) + ,@body)))) + + +@@ -1356,7 +1359,9 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ ,@(if (fboundp 'prog-mode) '(prog-mode)) emacs-lisp-mode @@ -66,7 +81,7 @@ index b8a7980f..9fadf00c 100644 (observed (yas--modes-to-activate))) (should (equal major-mode (car observed))) (should (equal (sort expected #'string<) (sort observed #'string<)))))))) -@@ -1418,7 +1423,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ +@@ -1384,7 +1389,11 @@ hello ${1:$(when (stringp yas-text) (funcall func yas-text))} foo${1:$$(concat \ '(prog-mode)) emacs-lisp-mode and-also-this-one @@ -79,7 +94,7 @@ index b8a7980f..9fadf00c 100644 (observed (yas--modes-to-activate))) (should (equal expected-first (cl-subseq observed 0 (length expected-first)))) -@@ -1691,9 +1700,11 @@ TODO: be meaner" +@@ -1657,9 +1666,11 @@ TODO: be meaner" "Test expansion of snippets in org source blocks." ;; org 9+ no longer runs fontification for text-mode, so our hacks ;; don't work. Note that old ert doesn't have skipping, so we have @@ -93,3 +108,6 @@ index b8a7980f..9fadf00c 100644 :passed :failed) (let ((text-mode-hook #'yas-minor-mode)) (do-yas-org-native-tab-in-source-block "text"))) +-- +2.37.2 +