me/guix
Archived
1
0
Fork 0
Code Activity

gnu: guile-fibers@1.1: Update to c25dcb9.

Browse source 
* gnu/packages/guile-xyz.scm (guile-fibers-1.1): Update to c25dcb9.
[arguments]: Remove 'regenerate-autotools' phase.
This commit is contained in:
Ludovic Courtès 2022-05-22 18:13:53 +02:00
parent f0e9048e98
commit b25b029a3c
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

138
gnu/packages/guile-xyz.scm
View file

@ -607,73 +607,73 @@ Unix-style DSV format and RFC 4180 format.")
(propagated-inputs `(("guile-lib" ,guile2.2-lib))))) (propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
(define-public guile-fibers-1.1 (define-public guile-fibers-1.1
(package ;; Pick one commit above 1.1.0, which fixes a bug that's critical for the
(name "guile-fibers") ;; Shepherd: <https://github.com/wingo/fibers/pull/57>.
(version "1.1.0") (let ((commit "c25dcb9cc4b5b977474ffe555b40ce2f1d0d1edc")
(source (origin (revision "0"))
(method url-fetch) (package
(uri (string-append (name "guile-fibers")
"https://github.com/wingo/fibers/releases/download/v" (version (git-version "1.1.0" revision commit))
version "/fibers-" version ".tar.gz")) (source (origin
(sha256 (method git-fetch)
(base32 (uri (git-reference
"1lqz39shlhif5fhpyv2wili0yzb0nhf5ciiv7mdqsq0vljirhrm0")) (url "https://github.com/wingo/fibers")
(patches (commit commit)))
(search-patches "guile-fibers-wait-for-io-readiness.patch")))) (file-name (git-file-name name version))
(build-system gnu-build-system) (sha256
(arguments (base32
'(#:phases (modify-phases %standard-phases "1jwr0y5x8mv8fm4df2vc3ll38fwwbkrm2iwfsfxa8l783a1a6143"))
;; This is required to make (patches
;; "guile-fibers-wait-for-io-readiness.patch" work. (search-patches "guile-fibers-wait-for-io-readiness.patch"))))
(add-after 'unpack 'regenerate-autotools (build-system gnu-build-system)
(lambda _ (arguments
(delete-file "configure"))) '(#:phases (modify-phases %standard-phases
(add-after 'unpack 'support-cross-compilation (add-after 'unpack 'support-cross-compilation
(lambda* (#:key target #:allow-other-keys) (lambda* (#:key target #:allow-other-keys)
;; Support cross-compilation. These issues are fixed in ;; Support cross-compilation. These issues are fixed in
;; Fibers commit c4756b9c336374546a41ac90a4431fcc8f7e98ee ;; Fibers commit c4756b9c336374546a41ac90a4431fcc8f7e98ee
;; and this phase can be removed for 1.1.1. ;; and this phase can be removed for 1.1.1.
(when target (when target
(substitute* "build-aux/guile.am" (substitute* "build-aux/guile.am"
(("\\$\\(AM_V_GEN\\)" all) (("\\$\\(AM_V_GEN\\)" all)
(string-append all " FIBERS_CROSS_COMPILING=yes ")) (string-append all " FIBERS_CROSS_COMPILING=yes "))
(("compile") (("compile")
(string-append "compile --target=" target (string-append "compile --target=" target
" -L $(abs_top_srcdir)"))) " -L $(abs_top_srcdir)")))
(substitute* "fibers/epoll.scm" (substitute* "fibers/epoll.scm"
(("\\(dynamic-call") (("\\(dynamic-call")
"(unless (getenv \"FIBERS_CROSS_COMPILING\") (dynamic-call") "(unless (getenv \"FIBERS_CROSS_COMPILING\") (dynamic-call")
(("\\(dynamic-link.*" all) (("\\(dynamic-link.*" all)
(string-append all ")\n")) (string-append all ")\n"))
(("#,(%sizeof|%offsetof)" _ prefix) (("#,(%sizeof|%offsetof)" _ prefix)
prefix))))) prefix)))))
(add-after 'install 'mode-guile-objects (add-after 'install 'mode-guile-objects
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; .go files are installed to "lib/guile/X.Y/cache". ;; .go files are installed to "lib/guile/X.Y/cache".
;; This phase moves them to "…/site-ccache". ;; This phase moves them to "…/site-ccache".
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib/guile")) (lib (string-append out "/lib/guile"))
(old (car (find-files lib "^ccache$" (old (car (find-files lib "^ccache$"
#:directories? #t))) #:directories? #t)))
(new (string-append (dirname old) (new (string-append (dirname old)
"/site-ccache"))) "/site-ccache")))
(rename-file old new) (rename-file old new)
#t)))))) #t))))))
(native-inputs (native-inputs
(list texinfo pkg-config autoconf automake libtool (list texinfo pkg-config autoconf automake libtool
guile-3.0 ;for 'guild compile guile-3.0 ;for 'guild compile
;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS' ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS'
gettext-minimal)) gettext-minimal))
(inputs (inputs
(list guile-3.0)) ;for libguile-3.0.so (list guile-3.0)) ;for libguile-3.0.so
(supported-systems (supported-systems
;; This version requires 'epoll' and is thus limited to Linux-based ;; This version requires 'epoll' and is thus limited to Linux-based
;; systems, but this may change soon: ;; systems, but this may change soon:
;; <https://github.com/wingo/fibers/pull/53>. ;; <https://github.com/wingo/fibers/pull/53>.
(filter (cut string-suffix? "-linux" <>) %supported-systems)) (filter (cut string-suffix? "-linux" <>) %supported-systems))
(synopsis "Lightweight concurrency facility for Guile") (synopsis "Lightweight concurrency facility for Guile")
(description (description
"Fibers is a Guile library that implements a a lightweight concurrency "Fibers is a Guile library that implements a a lightweight concurrency
facility, inspired by systems like Concurrent ML, Go, and Erlang. A fiber is facility, inspired by systems like Concurrent ML, Go, and Erlang. A fiber is
like a \"goroutine\" from the Go language: a lightweight thread-like like a \"goroutine\" from the Go language: a lightweight thread-like
abstraction. Systems built with Fibers can scale up to millions of concurrent abstraction. Systems built with Fibers can scale up to millions of concurrent
@ -683,8 +683,8 @@ communication between fibers.
Note that Fibers makes use of some Guile 2.1/2.2-specific features and Note that Fibers makes use of some Guile 2.1/2.2-specific features and
is not available for Guile 2.0.") is not available for Guile 2.0.")
(home-page "https://github.com/wingo/fibers") (home-page "https://github.com/wingo/fibers")
(license license:lgpl3+))) (license license:lgpl3+))))
(define-public guile-fibers (define-public guile-fibers
(package (package