all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [bug#27696] [PATCH] gnu: Update g-wrap to use guile-2.2.
@ 2017-07-14 10:13 Theodoros Foradis
  2017-07-20  8:54 ` bug#27696: " Ludovic Courtès
  0 siblings, 1 reply; 2+ messages in thread
From: Theodoros Foradis @ 2017-07-14 10:13 UTC (permalink / raw)
  To: 27696

* gnu/packages/guile.scm (g-wrap): [propagated-inputs]: Use guile-2.2.
[arguments]: Add "--disable-Werror" to configure-flags.
---
 gnu/packages/guile.scm | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index b654bbc96..f00628ac7 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2017 Andy Wingo <wingo@igalia.com>
 ;;; Copyright © 2017 David Thompson <davet@gnu.org>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2017 Theodoros Foradis <theodoros.for@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1339,20 +1340,21 @@ capabilities.")
     (native-inputs
      `(("pkg-config" ,pkg-config)))
     (propagated-inputs
-     `(("guile" ,guile-2.0)
+     `(("guile" ,guile-2.2)
        ("guile-lib" ,guile-lib)))
     (inputs
      `(("libffi" ,libffi)))
     (arguments
-      `(#:phases
-        (modify-phases %standard-phases
-          (add-before 'configure 'pre-configure
-            (lambda* (#:key outputs #:allow-other-keys)
-              (let ((out (assoc-ref outputs "out")))
-                (substitute* (find-files "." "^Makefile.in$")
-                  (("guilemoduledir =.*guile/site" all)
-                   (string-append all "/2.0")))
-                #t))))))
+     `(#:configure-flags '("--disable-Werror")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'pre-configure
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (substitute* (find-files "." "^Makefile.in$")
+                 (("guilemoduledir =.*guile/site" all)
+                  (string-append all "/2.2")))
+               #t))))))
     (synopsis "Generate C bindings for Guile")
     (description "G-Wrap is a tool and Guile library for generating function
 wrappers for inter-language calls.  It currently only supports generating Guile
-- 
2.13.2

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* bug#27696: [PATCH] gnu: Update g-wrap to use guile-2.2.
  2017-07-14 10:13 [bug#27696] [PATCH] gnu: Update g-wrap to use guile-2.2 Theodoros Foradis
@ 2017-07-20  8:54 ` Ludovic Courtès
  0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2017-07-20  8:54 UTC (permalink / raw)
  To: Theodoros Foradis; +Cc: 27696-done

Hi Theodoros,

Theodoros Foradis <theodoros.for@openmailbox.org> skribis:

> * gnu/packages/guile.scm (g-wrap): [propagated-inputs]: Use guile-2.2.
> [arguments]: Add "--disable-Werror" to configure-flags.

[...]

> +               (substitute* (find-files "." "^Makefile.in$")
> +                 (("guilemoduledir =.*guile/site" all)
> +                  (string-append all "/2.2")))

I changed “/2.2” to “/@GUILE_EFFECTIVE_VERSION@” and committed.

That way one can run:

  guix build g-wrap --with-input=guile@2.2=guile@2.0

and get a valid 2.0-based G-Wrap.

Thanks,
Ludo’.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2017-07-20  8:55 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-07-14 10:13 [bug#27696] [PATCH] gnu: Update g-wrap to use guile-2.2 Theodoros Foradis
2017-07-20  8:54 ` bug#27696: " Ludovic Courtès

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.