[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62307] [PATCH core-updates v2 19/20] gnu: guile-readline: Switch to
From: |
Ludovic Courtès |
Subject: |
[bug#62307] [PATCH core-updates v2 19/20] gnu: guile-readline: Switch to gexps. |
Date: |
Tue, 28 Mar 2023 16:28:51 +0200 |
* gnu/packages/guile.scm (make-guile-readline): Switch to gexps.
---
gnu/packages/guile.scm | 67 ++++++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index d18c155ab3..8e52448d36 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -470,42 +470,45 @@ (define* (make-guile-readline guile #:optional (name
"guile-readline"))
(source (package-source guile))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--disable-silent-rules"
- "--enable-mini-gmp") ;for Guile >= 3.0.6
- #:phases (modify-phases %standard-phases
- (add-before 'build 'chdir
- (lambda* (#:key outputs #:allow-other-keys)
- (invoke "make" "-C" "libguile" "scmconfig.h")
- (invoke "make" "-C" "lib")
- (chdir "guile-readline")
+ (list #:configure-flags
+ #~'("--disable-silent-rules"
+ "--enable-mini-gmp") ;for Guile >= 3.0.6
- (substitute* "Makefile"
- (("../libguile/libguile-[[:graph:]]+\\.la")
- ;; Remove dependency on libguile-X.Y.la.
- "")
- (("^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).
- "")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-before 'build 'chdir
+ (lambda* (#:key outputs #:allow-other-keys)
+ (invoke "make" "-C" "libguile" "scmconfig.h")
+ (invoke "make" "-C" "lib")
+ (chdir "guile-readline")
- ;; Install modules to the 'site' directories.
- (("^moddir = .*$")
- "moddir =
$(pkgdatadir)/site/$(GUILE_EFFECTIVE_VERSION)\n")
- (("^ccachedir = .*$")
- "ccachedir =
$(pkglibdir)/$(GUILE_EFFECTIVE_VERSION)/site-ccache\n"))
+ (substitute* "Makefile"
+ (("../libguile/libguile-[[:graph:]]+\\.la")
+ ;; Remove dependency on libguile-X.Y.la.
+ "")
+ (("^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.
- (substitute* "ice-9/readline.scm"
- (("load-extension \"guile-readline\"")
- (format #f "load-extension \
+ ;; Install modules to the 'site' directories.
+ (("^moddir = .*$")
+ "moddir =
$(pkgdatadir)/site/$(GUILE_EFFECTIVE_VERSION)\n")
+ (("^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\")"
- (assoc-ref outputs "out"))))
- #t)))))
+ (assoc-ref outputs "out"))))
+ #t)))))
(home-page (package-home-page guile))
(native-inputs (package-native-inputs guile))
(propagated-inputs (package-propagated-inputs guile))
--
2.39.2
- [bug#62307] [PATCH core-updates v2 04/20] gnu: cross-base: Factor out cross-mig., (continued)
- [bug#62307] [PATCH core-updates v2 04/20] gnu: cross-base: Factor out cross-mig., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 09/20] gnu: hurd: Update to 3ff7053., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 12/20] gnu: hurd: Update DDE and use libdde_linux26., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 10/20] gnu: hurd: Remove useless glibc/hurd-headers input., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 17/20] gnu: guile-static: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 06/20] gnu: cross-base: Removed useless inputs to xhurd-core-headers., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 11/20] gnu: gnumach, hurd-headers, hurd: Switch to using cross-mig., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 14/20] system: hurd: Use shepherd-0.8 in the package list., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 15/20] gnu: linux-pam: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 16/20] gnu: linux-pam: Allow compilation on GNU/Hurd., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 19/20] gnu: guile-readline: Switch to gexps.,
Ludovic Courtès <=
- [bug#62307] [PATCH core-updates v2 18/20] gnu: guile: Switch to gexps., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 20/20] gnu: guile: Fix 'posix_spawn' usage for GNU/Hurd., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 00/20] Update Hurd and fix build failures, Josselin Poiret, 2023/03/28
- bug#62307: [PATCH core-updates v2 00/20] Update Hurd and fix build failures, Ludovic Courtès, 2023/03/30
[bug#62307] [PATCH core-updates 03/15] gcc-11: Patch libstdc++ libpthread issue for Hurd only., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 04/15] cross-base: Factor out cross-mig., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 02/15] gnu-build-system: Sneak fixed glibc when cross-building for Hurd., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 06/15] cross-base: Removed useless inputs to xhurd-core-headers., Josselin Poiret, 2023/03/20
[bug#62307] [PATCH core-updates 07/15] mig: Update to 1.8+git20220827., Josselin Poiret, 2023/03/20