From patchwork Mon Aug 8 15:45:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vicvbcun X-Patchwork-Id: 41401 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 299FE27BBEA; Mon, 8 Aug 2022 16:52:15 +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_INVALID, DKIM_SIGNED,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 3976327BBF2 for ; Mon, 8 Aug 2022 16:52:09 +0100 (BST) Received: from localhost ([::1]:53162 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oL532-000435-CF for patchwork@mira.cbaines.net; Mon, 08 Aug 2022 11:52:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oL4zD-0000VD-Ma for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:12 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52015) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oL4zD-0006oN-CM for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:11 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oL4zD-0006AN-8V for guix-patches@gnu.org; Mon, 08 Aug 2022 11:48:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56729] [RFC PATCH v2 01/29] gnu: Remove ecl-16. Resent-From: vicvbcun Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Aug 2022 15:48:11 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56729 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56729@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Andreas Enge Received: via spool by 56729-submit@debbugs.gnu.org id=B56729.165997366823412 (code B ref 56729); Mon, 08 Aug 2022 15:48:11 +0000 Received: (at 56729) by debbugs.gnu.org; 8 Aug 2022 15:47:48 +0000 Received: from localhost ([127.0.0.1]:41726 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4yp-00065T-Vm for submit@debbugs.gnu.org; Mon, 08 Aug 2022 11:47:48 -0400 Received: from mo4-p05-ob.smtp.rzone.de ([81.169.146.180]:34607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oL4yY-00061y-Kd for 56729@debbugs.gnu.org; Mon, 08 Aug 2022 11:47:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1659973638; s=strato-dkim-0002; d=ikherbers.com; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Cc:Date: From:Subject:Sender; bh=Auz7gbBTBoq+PLFBU2rWwDWYmFPl8Q8+USAbrVnaHwI=; b=FAE47MCkaeSEgZZPlYia85GHQLpV8b/AKetwTM3jrDrXduzQ/t/j4tD4DoyD9QzYds Efl8pHRK9jpzhQudMwGswXcf/OMslK2KVTJD1ICgHggsgj97F/wRjxAcIJU2H/7BgKL/ 1R/m1J8a6BHd19msDh1ejMeNeZJZ8929cC0XByOm2Av7XZ9F1t8NIPvSTIEHoYWGDeJN RK3uEscTp8zOrphQlt/wM+66IgmIxSwuN4lOMgwFpq+bkSZxlrJBglUpdYlbSWd7T0yN ep2g6DVww5ZAXe8ed+r4HFN7lXvyzizvcEIZu10AiHpWYX5kGfr4htmw2iceURz3QzQq KTdA== Authentication-Results: strato.com; dkim=none X-RZG-AUTH: ":IUwNfkitaf3qOWm2b/jA5tveVwUUcwH3PkiYp6DPxTDDEo4xO9ymAEzKSWlvmNAhIG6s" X-RZG-CLASS-ID: mo05 Received: from lambda.localdomain by smtp.strato.de (RZmta 47.47.0 DYNA|AUTH) with ESMTPSA id 0cac6cy78FlHoRE (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Mon, 8 Aug 2022 17:47:17 +0200 (CEST) From: vicvbcun Date: Mon, 8 Aug 2022 17:45:36 +0200 Message-Id: <786a15803950a03fa7f47abe8e3457c4d7d611f4.1659973115.git.guix@ikherbers.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: References: 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/sagemath.scm (ecl-16): Delete variable. * gnu/packages/patches/ecl-16-format-directive-limit.patch, gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch, gnu/packages/patches/ecl-16-libffi.patch: Delete files. * gnu/local.mk (dist_patch_DATA): Remove them here. --- gnu/local.mk | 3 - .../ecl-16-format-directive-limit.patch | 83 ------------------- .../ecl-16-ignore-stderr-write-error.patch | 17 ---- gnu/packages/patches/ecl-16-libffi.patch | 16 ---- gnu/packages/sagemath.scm | 21 ----- 5 files changed, 140 deletions(-) delete mode 100644 gnu/packages/patches/ecl-16-format-directive-limit.patch delete mode 100644 gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch delete mode 100644 gnu/packages/patches/ecl-16-libffi.patch diff --git a/gnu/local.mk b/gnu/local.mk index 07e3497d10..2049964ff7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1013,9 +1013,6 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dvd+rw-tools-add-include.patch \ %D%/packages/patches/dynaconf-unvendor-deps.patch \ - %D%/packages/patches/ecl-16-format-directive-limit.patch \ - %D%/packages/patches/ecl-16-ignore-stderr-write-error.patch \ - %D%/packages/patches/ecl-16-libffi.patch \ %D%/packages/patches/efibootmgr-remove-extra-decl.patch \ %D%/packages/patches/efivar-211.patch \ %D%/packages/patches/eigen-remove-openmp-error-counting.patch \ diff --git a/gnu/packages/patches/ecl-16-format-directive-limit.patch b/gnu/packages/patches/ecl-16-format-directive-limit.patch deleted file mode 100644 index 237db92722..0000000000 --- a/gnu/packages/patches/ecl-16-format-directive-limit.patch +++ /dev/null @@ -1,83 +0,0 @@ -Patch backported by Sage. - -Fix from upstream that happens to work around -https://trac.sagemath.org/ticket/23011 -diff --git a/src/lsp/format.lsp b/src/lsp/format.lsp -index 77ca799..53b887c 100644 ---- a/src/lsp/format.lsp -+++ b/src/lsp/format.lsp -@@ -307,11 +307,13 @@ - :start (format-directive-start struct) - :end (format-directive-end struct)))) - -+(defconstant +format-directive-limit+ (1+ (char-code #\~))) -+ - #+formatter - (defparameter *format-directive-expanders* -- (make-array char-code-limit :initial-element nil)) -+ (make-array +format-directive-limit+ :initial-element nil)) - (defparameter *format-directive-interpreters* -- (make-array char-code-limit :initial-element nil)) -+ (make-array +format-directive-limit+ :initial-element nil)) - - (defparameter *default-format-error-control-string* nil) - (defparameter *default-format-error-offset* nil) -@@ -550,24 +552,24 @@ - (write-string directive stream) - (interpret-directive-list stream (cdr directives) orig-args args)) - (#-ecl format-directive #+ecl vector -+ (multiple-value-bind -+ (new-directives new-args) -+ (let* ((code (char-code (format-directive-character directive))) -+ (function -+ (and (< code +format-directive-limit+) -+ (svref *format-directive-interpreters* code))) -+ (*default-format-error-offset* -+ (1- (format-directive-end directive)))) -+ (unless function -+ (error 'format-error -+ :complaint "Unknown format directive.")) - (multiple-value-bind - (new-directives new-args) -- (let ((function -- (svref *format-directive-interpreters* -- (char-code (format-directive-character -- directive)))) -- (*default-format-error-offset* -- (1- (format-directive-end directive)))) -- (unless function -- (error 'format-error -- :complaint "Unknown format directive.")) -- (multiple-value-bind -- (new-directives new-args) -- (funcall function stream directive -- (cdr directives) orig-args args) -- (values new-directives new-args))) -- (interpret-directive-list stream new-directives -- orig-args new-args))))) -+ (funcall function stream directive -+ (cdr directives) orig-args args) -+ (values new-directives new-args))) -+ (interpret-directive-list stream new-directives -+ orig-args new-args))))) - args)) - - -@@ -639,11 +641,12 @@ - (values `(write-string ,directive stream) - more-directives)) - (format-directive -- (let ((expander -- (aref *format-directive-expanders* -- (char-code (format-directive-character directive)))) -- (*default-format-error-offset* -- (1- (format-directive-end directive)))) -+ (let* ((code (char-code (format-directive-character directive))) -+ (expander -+ (and (< code +format-directive-limit+) -+ (svref *format-directive-expanders* code))) -+ (*default-format-error-offset* -+ (1- (format-directive-end directive)))) - (if expander - (funcall expander directive more-directives) - (error 'format-error diff --git a/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch b/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch deleted file mode 100644 index 42d213c0e9..0000000000 --- a/gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch adapted from Sage. -diff -Naur ecl-16.1.2.orig/src/c/file.d ecl-16.1.2/src/c/file.d ---- ecl-16.1.2.orig/src/c/file.d 2016-05-11 13:10:51.867673867 +1200 -+++ ecl-16.1.2/src/c/file.d 2016-05-11 14:44:48.121907307 +1200 -@@ -3354,8 +3354,10 @@ - ecl_disable_interrupts(); - do { - out = fwrite(c, sizeof(char), n, IO_STREAM_FILE(strm)); -- } while (out < n && restartable_io_error(strm, "fwrite")); -- ecl_enable_interrupts(); -+ /* Ignore write errors to stderr to avoid an infinite loop */ -+ } while (out < n && (IO_STREAM_FILE(strm) != stderr) && restartable_io_error(strm, "fwrite")); -+ -+ ecl_enable_interrupts(); - return out; - } - diff --git a/gnu/packages/patches/ecl-16-libffi.patch b/gnu/packages/patches/ecl-16-libffi.patch deleted file mode 100644 index fc06a07606..0000000000 --- a/gnu/packages/patches/ecl-16-libffi.patch +++ /dev/null @@ -1,16 +0,0 @@ -Patch adapted from Sage. Allows building ECL on libffi 3.3. -diff --git a/src/c/ffi.d b/src/c/ffi.d -index 8861303e..8a959c23 100644 ---- a/src/c/ffi.d -+++ b/src/c/ffi.d -@@ -133,8 +133,8 @@ static struct { - #elif defined(X86_WIN64) - {@':win64', FFI_WIN64}, - #elif defined(X86_ANY) || defined(X86) || defined(X86_64) -- {@':cdecl', FFI_SYSV}, -- {@':sysv', FFI_SYSV}, -+ {@':cdecl', FFI_UNIX64}, -+ {@':sysv', FFI_UNIX64}, - {@':unix64', FFI_UNIX64}, - #endif - }; diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index 7f76f8912b..75720f31a5 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -174,27 +174,6 @@ (define-public libhomfly (license license:public-domain) (home-page "https://github.com/miguelmarco/libhomfly"))) -;; Sage 9.1 doesn't build with ECL 20. This won't be necessary once 9.2 is -;; released. See https://trac.sagemath.org/ticket/22191 -(define-public ecl-16 - (package - (inherit ecl) - (version "16.1.3") - (source - (origin - (method url-fetch) - (uri (string-append - "https://common-lisp.net/project/ecl/static/files/release/ecl" - "-" version ".tgz")) - (sha256 - (base32 "0m0j24w5d5a9dwwqyrg0d35c0nys16ijb4r0nyk87yp82v38b9bn")) - (patches (search-patches - "ecl-16-libffi.patch" - "ecl-16-ignore-stderr-write-error.patch" - "ecl-16-format-directive-limit.patch")))) - ;; Current ECL uses LGPL 2.1+ - (license license:lgpl2.0+))) - (define-public pynac (package (name "pynac")