From: Ricardo Wurmus <rekado@elephly.net>
To: guix-devel@gnu.org
Subject: [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version.
Date: Tue, 13 Sep 2016 16:21:29 +0200 [thread overview]
Message-ID: <20160913142130.3270-1-rekado@elephly.net> (raw)
* gnu/packages/guile.scm (guile-redis)[snippet]: Modify 'ac_subst_vars'
in 'configure', and use "@GUILE_EFFECTIVE_VERSION@" instead of "2.0" in
'Makefile.in'.
---
gnu/packages/guile.scm | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 2294b16..5b8fffe 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -935,13 +935,17 @@ above command-line parameters.")
"0vx6if6b4r3kwx64vzbs6vpc0cpcr85x11w9vkzq27gw8n7isv56"))
(modules '((guix build utils)))
(snippet
- ;; Make sure everything goes under .../site/2.0, like Guile's
+ ;; Make sure everything goes under .../site/X.Y, like Guile's
;; search paths expects.
- '(substitute* '("Makefile.in"
- "redis/Makefile.in"
- "redis/commands/Makefile.in")
- (("moddir =.*/share/guile/site" all)
- (string-append all "/2.0"))))))
+ '(begin
+ (substitute* "configure"
+ (("ac_subst_vars='")
+ "ac_subst_vars='GUILE_EFFECTIVE_VERSION\n"))
+ (substitute* '("Makefile.in"
+ "redis/Makefile.in"
+ "redis/commands/Makefile.in")
+ (("moddir =.*/share/guile/site" all)
+ (string-append all "/@GUILE_EFFECTIVE_VERSION@")))))))
(build-system gnu-build-system)
(native-inputs
`(("guile" ,guile-2.0)))
--
2.10.0
next reply other threads:[~2016-09-13 14:21 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-13 14:21 Ricardo Wurmus [this message]
2016-09-13 14:21 ` [PATCH 2/2] gnu: Add guile2.2-redis Ricardo Wurmus
2016-09-13 22:03 ` Ludovic Courtès
2016-09-14 7:35 ` Ricardo Wurmus
2016-09-13 22:03 ` [PATCH 1/2] gnu: guile-redis: Remove hard-coded Guile effective version Ludovic Courtès
2016-09-14 7:36 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160913142130.3270-1-rekado@elephly.net \
--to=rekado@elephly.net \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.