[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#62307] [PATCH core-updates v2 17/20] gnu: guile-static: Switch to g
From: |
Ludovic Courtès |
Subject: |
[bug#62307] [PATCH core-updates v2 17/20] gnu: guile-static: Switch to gexps. |
Date: |
Tue, 28 Mar 2023 16:28:49 +0200 |
* gnu/packages/make-bootstrap.scm (make-guile-static): Switch to gexps.
---
gnu/packages/make-bootstrap.scm | 58 ++++++++++++++++-----------------
1 file changed, 29 insertions(+), 29 deletions(-)
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 2eed01ece8..6bafc5697c 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -613,44 +613,44 @@ (define* (make-guile-static guile patches)
(replace "libgc" libgc/static-libs)))
(arguments
(substitute-keyword-arguments (package-arguments guile)
- ((#:configure-flags flags '())
+ ((#:configure-flags flags #~'())
;; When `configure' checks for ltdl availability, it
;; doesn't try to link using libtool, and thus fails
;; because of a missing -ldl. Work around that.
- `(list "LDFLAGS=-ldl" "--enable-mini-gmp"
+ #~(list "LDFLAGS=-ldl" "--enable-mini-gmp"
- ;; Guile does an LTO build by default, but in 3.0.9 it
- ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around
- ;; it (see <https://issues.guix.gnu.org/61086>).
- ,@(if (version-prefix? "3.0" (package-version guile))
- '("AR=gcc-ar" "RANLIB=gcc-ranlib")
- '())
+ ;; Guile does an LTO build by default, but in 3.0.9 it
+ ;; wrongfully picks 'ar' instead of 'gcc-ar', so work around
+ ;; it (see <https://issues.guix.gnu.org/61086>).
+ #$@(if (version-prefix? "3.0" (package-version guile))
+ #~("AR=gcc-ar" "RANLIB=gcc-ranlib")
+ #~())
- ,@(if (hurd-target?)
- '("--disable-jit")
- '())))
+ #$@(if (hurd-target?)
+ #~("--disable-jit")
+ #~())))
((#:phases phases '%standard-phases)
- `(modify-phases ,phases
+ #~(modify-phases #$phases
- ;; Do not record the absolute file name of 'sh' in
- ;; (ice-9 popen). This makes 'open-pipe' unusable in
- ;; a build chroot ('open-pipe*' is fine) but avoids
- ;; keeping a reference to Bash.
- (delete 'pre-configure)
+ ;; Do not record the absolute file name of 'sh' in
+ ;; (ice-9 popen). This makes 'open-pipe' unusable in
+ ;; a build chroot ('open-pipe*' is fine) but avoids
+ ;; keeping a reference to Bash.
+ (delete 'pre-configure)
- (add-before 'configure 'static-guile
- (lambda _
- (substitute* "libguile/Makefile.in"
- ;; Create a statically-linked `guile'
- ;; executable.
- (("^guile_LDFLAGS =")
- "guile_LDFLAGS = -all-static")
+ (add-before 'configure 'static-guile
+ (lambda _
+ (substitute* "libguile/Makefile.in"
+ ;; Create a statically-linked `guile'
+ ;; executable.
+ (("^guile_LDFLAGS =")
+ "guile_LDFLAGS = -all-static")
- ;; Add `-ldl' *after* libguile-2.0.la.
- (("^guile_LDADD =(.*)$" _ ldadd)
- (string-append "guile_LDADD = "
- (string-trim-right ldadd)
- " -ldl\n")))))))
+ ;; Add `-ldl' *after* libguile-2.0.la.
+ (("^guile_LDADD =(.*)$" _ ldadd)
+ (string-append "guile_LDADD = "
+ (string-trim-right ldadd)
+ " -ldl\n")))))))
((#:tests? _ #f)
;; There are uses of `dynamic-link' in
;; {foreign,coverage}.test that don't fly here.
--
2.39.2
- [bug#62307] [PATCH core-updates v2 01/20] gnu: glibc: Work around broken GNU Mach header detection., (continued)
- [bug#62307] [PATCH core-updates v2 01/20] gnu: glibc: Work around broken GNU Mach header detection., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 05/20] gnu: cross-base: Add cross arguments to hurd derivatives., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 03/20] gnu: gcc@11: Patch libpthread on GNU/Hurd., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 07/20] gnu: mig: Update to 1.8+git20220827., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 08/20] gnu: gnumach: Update to 1.8+git20220827., Ludovic Courtès, 2023/03/28
- [bug#62307] [PATCH core-updates v2 13/20] gnu: mig/32-bit: Remove., Ludovic Courtès, 2023/03/28
- [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 <=
- [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, 2023/03/28
- [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