Subject: bug#73887: closed (Re: [bug#73887] [PATCH v2] gnu: stklos: Update to 2.10.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 20 Oct 2024 14:34:04 +0000

Your bug report

#73887: [PATCH] gnu: stklos: Update to 2.10.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
73887: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=73887
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#73887] [PATCH v2] gnu: stklos: Update to 2.10.
From: Zheng Junjie <[email-masked]>
To: Ashish SHUKLA via Guix-patches via <[email-masked]>
Cc: [email-masked], Ashish SHUKLA <[email-masked]>
Date: Sun, 20 Oct 2024 22:33:06 +0800
List-Id: <debbugs-submit.debbugs.gnu.org>

Ashish SHUKLA via Guix-patches via <[email-masked]> writes:

> * gnu/packages/scheme.scm (stklos): Update to 2.10.
> [inputs]: Add gmp, libgc, pcre2, libffi, and readline.
> [native-inputs]: Add pkg-config.
> [arguments]<#:configure-flags>: set LDFLAGS flag.
>
> Change-Id: Ife374dd60ef17129fa88b7a0940ab914e7b3c396
> Co-authored-by: Zheng Junjie <[email-masked]>
> ---
> Hi,
>
> Thanks for reviewing the diff. Update diff according to suggestions, and
> added credit for the same.
>
> Thanks!
>
>  gnu/packages/scheme.scm | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
> index 6f9d00e440..0d6a662aaa 100644
> --- a/gnu/packages/scheme.scm
> +++ b/gnu/packages/scheme.scm
> @@ -86,6 +86,7 @@ (define-module (gnu packages scheme)
>    #:use-module (gnu packages netpbm)
>    #:use-module (gnu packages pcre)
>    #:use-module (gnu packages pkg-config)
> +  #:use-module (gnu packages readline)
>    #:use-module (gnu packages sqlite)
>    #:use-module (gnu packages tex)
>    #:use-module (gnu packages texinfo)
> @@ -1275,7 +1276,7 @@ (define-public emacs-gerbil-mode
>  (define-public stklos
>    (package
>      (name "stklos")
> -    (version "1.70")
> +    (version "2.10")
>      (source (origin
>                (method url-fetch)
>                ;; TODO: Unbundle pcre, libgc, and libffi.
> @@ -1283,12 +1284,18 @@ (define-public stklos
>                                    version ".tar.gz"))
>                (sha256
>                 (base32
> -                "1iw3pgycjz3kz3jd1855v2ngf8ib2almpf8v058n1mkj1qd2b88m"))))
> +                "0hd05r5pr3yhgq44n5sqdmvkpgnhf5fybmis2g3gwj10z52h7gvd"))))
>      (build-system gnu-build-system)
> +    (native-inputs (list pkg-config))
> +    (inputs (list gmp libgc pcre2 libffi readline))
>      (arguments
>       (list
>        #:modules `((ice-9 ftw)
>                    ,@%default-gnu-modules)
> +      #:configure-flags
> +      #~(list (string-append "LDFLAGS=-L"
> +                #$(this-package-input "readline")
> +                "/lib -lreadline"))
>        #:phases
>        #~(modify-phases %standard-phases
>            (add-before 'configure 'patch-sh-references
>
> base-commit: e951a375a01262dfd470ee343baf7c41dbc6ff58

push, close.

Subject: [PATCH] gnu: stklos: Update to 2.10.
From: Ashish SHUKLA <[email-masked]>
To: [email-masked]
Cc: Ashish SHUKLA <[email-masked]>
Date: Sat, 19 Oct 2024 17:48:46 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

* gnu/packages/scheme.scm (stklos): Update to 2.10.
  [inputs]: Add variable. [native-inputs]: Add variable.
  [arguments] Add configure-flags.

Change-Id: Ife374dd60ef17129fa88b7a0940ab914e7b3c396
---
Hi,

Attached patch updates STklos to 2.10. For readline/libedit support, it
relies on rtld, this is accomplished by linking it with readline, so it
gets added to the rpath, and therefore available at runtime.

Thanks!

 gnu/packages/scheme.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm
index 6f9d00e440..c97fab8b93 100644
--- a/gnu/packages/scheme.scm
+++ b/gnu/packages/scheme.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages scheme)
   #:use-module (gnu packages netpbm)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages readline)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages tex)
   #:use-module (gnu packages texinfo)
@@ -1275,7 +1276,7 @@ (define-public emacs-gerbil-mode
 (define-public stklos
   (package
     (name "stklos")
-    (version "1.70")
+    (version "2.10")
     (source (origin
               (method url-fetch)
               ;; TODO: Unbundle pcre, libgc, and libffi.
@@ -1283,12 +1284,18 @@ (define-public stklos
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1iw3pgycjz3kz3jd1855v2ngf8ib2almpf8v058n1mkj1qd2b88m"))))
+                "0hd05r5pr3yhgq44n5sqdmvkpgnhf5fybmis2g3gwj10z52h7gvd"))))
     (build-system gnu-build-system)
+    (native-inputs (list pkg-config))
+    (inputs (list gmp libgc pcre2 libffi readline))
     (arguments
      (list
       #:modules `((ice-9 ftw)
                   ,@%default-gnu-modules)
+      #:configure-flags
+      '(list (string-append "LDFLAGS=-L"
+               (assoc-ref %build-inputs "readline")
+               "/lib -lreadline"))
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'configure 'patch-sh-references

base-commit: 5794926bed6fad4598bb565fb7f49be4205b11a1
-- 
2.47.0