03/03: squash! gnu: guile-json: Cross-build fix.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit f187b0e9928c670e3de3e796c4c60c238dca3a7d
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Tue Apr 7 22:21:31 2020 +0200

    squash! gnu: guile-json: Cross-build fix.
---
 gnu/packages/patches/guile-json-cross.patch | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/patches/guile-json-cross.patch 
b/gnu/packages/patches/guile-json-cross.patch
index f003f13..5e8f40f 100644
--- a/gnu/packages/patches/guile-json-cross.patch
+++ b/gnu/packages/patches/guile-json-cross.patch
@@ -1,4 +1,4 @@
-From 0ebc6b8f89680f5353693f591c24c82c8cea9ba1 Mon Sep 17 00:00:00 2001
+From 9bbe0d78391c6dbe0316aa56a105d1966fddc9f0 Mon Sep 17 00:00:00 2001
 From: Jan Nieuwenhuizen <address@hidden>
 Date: Wed, 4 Mar 2020 11:17:02 +0100
 Subject: [PATCH] build: Support cross building.
@@ -13,7 +13,7 @@ Subject: [PATCH] build: Support cross building.
  3 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 996f18b..e9434be 100644
+index 996f18b..1823a3f 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -42,7 +42,7 @@ nobase_nodist_obj_DATA = $(GOBJECTS)
@@ -21,7 +21,7 @@ index 996f18b..e9434be 100644
  SUFFIXES = .scm .go
  .scm.go:
 -      $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
-+      $(top_builddir)/env $(GUILE_TOOLS) compile --target="$(host)" 
$(GUILE_WARNINGS) -o "$@" "$<"
++      $(top_builddir)/env $(GUILD) compile --target="$(host)" 
$(GUILE_WARNINGS) -o "$@" "$<"
  
  SOURCES = json.scm
  
@@ -38,7 +38,7 @@ index fbc1aff..937dcf7 100644
  dnl We require pkg.m4 (from pkg-config) and guile.m4.
  dnl Make sure they are available.
 diff --git a/json/Makefile.am b/json/Makefile.am
-index adf5972..0085a81 100644
+index adf5972..103b867 100644
 --- a/json/Makefile.am
 +++ b/json/Makefile.am
 @@ -36,4 +36,4 @@ CLEANFILES = $(GOBJECTS)
@@ -46,7 +46,7 @@ index adf5972..0085a81 100644
  SUFFIXES = .scm .go
  .scm.go:
 -      $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
-+      $(top_builddir)/env $(GUILE_TOOLS) compile --target="$(host)" 
$(GUILE_WARNINGS) -o "$@" "$<"
++      $(top_builddir)/env $(GUILD) compile --target="$(host)" 
$(GUILE_WARNINGS) -o "$@" "$<"
 -- 
-2.24.0
+2.26.0