me/guix
Archived
1
0
Fork 0
Code Activity

gnu: guile-readline: Switch to gexps.

Browse source 
* gnu/packages/guile.scm (make-guile-readline): Switch to gexps.
This commit is contained in:
Ludovic Courtès 2023-03-27 12:30:00 +02:00
parent b37825934e
commit 0b2d1fd410
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
gnu/packages/guile.scm
View file

@ -470,42 +470,45 @@ without requiring the source code to be rewritten.")
(source (package-source guile)) (source (package-source guile))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--disable-silent-rules" (list #:configure-flags
"--enable-mini-gmp") ;for Guile >= 3.0.6 #~'("--disable-silent-rules"
#:phases (modify-phases %standard-phases "--enable-mini-gmp") ;for Guile >= 3.0.6
(add-before 'build 'chdir
(lambda* (#:key outputs #:allow-other-keys)
(invoke "make" "-C" "libguile" "scmconfig.h")
(invoke "make" "-C" "lib")
(chdir "guile-readline")
(substitute* "Makefile" #:phases
(("../libguile/libguile-[[:graph:]]+\\.la") #~(modify-phases %standard-phases
;; Remove dependency on libguile-X.Y.la. (add-before 'build 'chdir
"") (lambda* (#:key outputs #:allow-other-keys)
(("^READLINE_LIBS = (.*)$" _ libs) (invoke "make" "-C" "libguile" "scmconfig.h")
;; Link against the provided libguile. (invoke "make" "-C" "lib")
(string-append "READLINE_LIBS = " (chdir "guile-readline")
"-lguile-$(GUILE_EFFECTIVE_VERSION) "
libs "\n"))
(("\\$\\(top_builddir\\)/meta/build-env")
;; Use the provided Guile, not the one from
;; $(builddir).
"")
;; Install modules to the 'site' directories. (substitute* "Makefile"
(("^moddir = .*$") (("../libguile/libguile-[[:graph:]]+\\.la")
"moddir = $(pkgdatadir)/site/$(GUILE_EFFECTIVE_VERSION)\n") ;; Remove dependency on libguile-X.Y.la.
(("^ccachedir = .*$") "")
"ccachedir = $(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache\n")) (("^READLINE_LIBS = (.*)$" _ libs)
;; Link against the provided libguile.
(string-append "READLINE_LIBS = "
"-lguile-$(GUILE_EFFECTIVE_VERSION) "
libs "\n"))
(("\\$\\(top_builddir\\)/meta/build-env")
;; Use the provided Guile, not the one from
;; $(builddir).
"")
;; Load 'guile-readline.so' from the right place. ;; Install modules to the 'site' directories.
(substitute* "ice-9/readline.scm" (("^moddir = .*$")
(("load-extension \"guile-readline\"") "moddir = $(pkgdatadir)/site/$(GUILE_EFFECTIVE_VERSION)\n")
(format #f "load-extension \ (("^ccachedir = .*$")
"ccachedir = $(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache\n"))
;; Load 'guile-readline.so' from the right place.
(substitute* "ice-9/readline.scm"
(("load-extension \"guile-readline\"")
(format #f "load-extension \
(string-append ~s \"/lib/guile/\" (effective-version) \"/extensions/guile-readline\")" (string-append ~s \"/lib/guile/\" (effective-version) \"/extensions/guile-readline\")"
(assoc-ref outputs "out")))) (assoc-ref outputs "out"))))
#t))))) #t)))))
(home-page (package-home-page guile)) (home-page (package-home-page guile))
(native-inputs (package-native-inputs guile)) (native-inputs (package-native-inputs guile))
(propagated-inputs (package-propagated-inputs guile)) (propagated-inputs (package-propagated-inputs guile))