guile-json cross-build fix

guile-json cross-build fix

[Jan Nieuwenhuizen]

[-- Attachment #1: Type: text/plain, Size: 64 bytes --]

Hi!

Please find cross build fix attached.

Greetings,
janneke


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-Support-cross-building.patch --]
[-- Type: text/x-patch, Size: 1721 bytes --]

From 0ebc6b8f89680f5353693f591c24c82c8cea9ba1 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 4 Mar 2020 11:17:02 +0100
Subject: [PATCH] build: Support cross building.

* configure.ac: Add AC_CANONICAL_HOST to get host.
* Makefile.am (.scm.go): Set it as target.
* json/Makefile.am (.scm.go): Likewise.
---
 Makefile.am      | 2 +-
 configure.ac     | 1 +
 json/Makefile.am | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 996f18b..e9434be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ nobase_nodist_obj_DATA = $(GOBJECTS)
 GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
 SUFFIXES = .scm .go
 .scm.go:
-	$(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
+	$(top_builddir)/env $(GUILE_TOOLS) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<"
 
 SOURCES = json.scm
 
diff --git a/configure.ac b/configure.ac
index fbc1aff..937dcf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ AC_CONFIG_SRCDIR(json.scm)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability])
 AM_SILENT_RULES([yes])
+AC_CANONICAL_HOST
 
 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
--- a/json/Makefile.am
+++ b/json/Makefile.am
@@ -36,4 +36,4 @@ CLEANFILES = $(GOBJECTS)
 GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
 SUFFIXES = .scm .go
 .scm.go:
-	$(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
+	$(top_builddir)/env $(GUILE_TOOLS) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<"
-- 
2.24.0


[-- Attachment #3: Type: text/plain, Size: 152 bytes --]


-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

Re: guile-json cross-build fix

[Jan Nieuwenhuizen]

[-- Attachment #1: Type: text/plain, Size: 313 bytes --]

Jan Nieuwenhuizen writes:

Hello again;

> -	$(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
> +	$(top_builddir)/env $(GUILE_TOOLS) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<"

I hear that GUILD is the new GUILE_TOOLS; better not change that bit.

Fresh patch attached.
janneke


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-Support-cross-building.patch --]
[-- Type: text/x-patch, Size: 1709 bytes --]

From 9bbe0d78391c6dbe0316aa56a105d1966fddc9f0 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 4 Mar 2020 11:17:02 +0100
Subject: [PATCH] build: Support cross building.

* configure.ac: Add AC_CANONICAL_HOST to get host.
* Makefile.am (.scm.go): Set it as target.
* json/Makefile.am (.scm.go): Likewise.
---
 Makefile.am      | 2 +-
 configure.ac     | 1 +
 json/Makefile.am | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 996f18b..1823a3f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ nobase_nodist_obj_DATA = $(GOBJECTS)
 GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
 SUFFIXES = .scm .go
 .scm.go:
-	$(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
+	$(top_builddir)/env $(GUILD) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<"
 
 SOURCES = json.scm
 
diff --git a/configure.ac b/configure.ac
index fbc1aff..937dcf7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ AC_CONFIG_SRCDIR(json.scm)
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([color-tests -Wall -Wno-portability])
 AM_SILENT_RULES([yes])
+AC_CANONICAL_HOST
 
 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..103b867 100644
--- a/json/Makefile.am
+++ b/json/Makefile.am
@@ -36,4 +36,4 @@ CLEANFILES = $(GOBJECTS)
 GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
 SUFFIXES = .scm .go
 .scm.go:
-	$(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
+	$(top_builddir)/env $(GUILD) compile --target="$(host)" $(GUILE_WARNINGS) -o "$@" "$<"
-- 
2.26.0


[-- Attachment #3: Type: text/plain, Size: 152 bytes --]


-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

Re: guile-json cross-build fix

[Aleix Conchillo Flaqué]

Hi!

On Tue, Apr 7, 2020 at 1:20 PM Jan Nieuwenhuizen <janneke@gnu.org> wrote:

> Jan Nieuwenhuizen writes:
>
> Hello again;
>
> > -     $(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
> > +     $(top_builddir)/env $(GUILE_TOOLS) compile --target="$(host)"
> $(GUILE_WARNINGS) -o "$@" "$<"
>
> I hear that GUILD is the new GUILE_TOOLS; better not change that bit.
>
> Fresh patch attached.
>
>
Thank you! It seems I can't apply it directly to master. I could do it
myself, but I'm wondering if you are using an older version... Would you
mind do it on master?

Thanks again,

Aleix

Re: guile-json cross-build fix

[Jan Nieuwenhuizen]

Aleix Conchillo Flaqué writes:

Hi!

> Thank you! It seems I can't apply it directly to master. I could do it
> myself, but I'm wondering if you are using an older version..

That's odd.

> Would you mind do it on master?

As far as I can see, I'm up to date

    http://git.savannah.nongnu.org/cgit/guile-json.git/log
    http://git.savannah.nongnu.org/cgit/guile-json.git/commit/?id=c95a72735ceb2506ec2a0c1cf7deaf33868a262c

Which my patch seems to be right on top of

    9bbe0d78391c6dbe0316aa56a105d1966fddc9f0 build: Support cross building.
    c95a72735ceb2506ec2a0c1cf7deaf33868a262c Merge pull request #38 from aconchillo/issue-34-document-object-keys

Greetings,
janneke

From 9bbe0d78391c6dbe0316aa56a105d1966fddc9f0 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 4 Mar 2020 11:17:02 +0100
Subject: [PATCH] build: Support cross building.

-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

Re: guile-json cross-build fix

[Aleix Conchillo Flaqué]

On Wed, Apr 8, 2020 at 2:15 AM Jan Nieuwenhuizen <janneke@gnu.org> wrote:

> Aleix Conchillo Flaqué writes:
>
> Hi!
>
> > Thank you! It seems I can't apply it directly to master. I could do it
> > myself, but I'm wondering if you are using an older version..
>
> That's odd.
>
>
Oh... I know what happened. I used to push commits to a private server that
then would push to github and savannah witha commit hook, but I don't have
that anymore so I have not been updating savannah.


> > Would you mind do it on master?
>
> As far as I can see, I'm up to date
>
>     http://git.savannah.nongnu.org/cgit/guile-json.git/log
>
> http://git.savannah.nongnu.org/cgit/guile-json.git/commit/?id=c95a72735ceb2506ec2a0c1cf7deaf33868a262c
>
>
Should be updated now. My bad, sorry about that.

Aleix

Re: guile-json cross-build fix

[Jan Nieuwenhuizen]

[-- Attachment #1: Type: text/plain, Size: 730 bytes --]

Aleix Conchillo Flaqué writes:

Hello Aleix,

> Oh... I know what happened. I used to push commits to a private server
> that then would push to github and savannah witha commit hook, but I
> don't have that anymore so I have not been updating savannah.

Ah, that explains things!

>  > Would you mind do it on master?
>
>  As far as I can see, I'm up to date
>
>      http://git.savannah.nongnu.org/cgit/guile-json.git/log
>      http://git.savannah.nongnu.org/cgit/guile-json.git/commit/?id=c95a72735ceb2506ec2a0c1cf7deaf33868a262c
>
> Should be updated now. My bad, sorry about that.

Find attached; only a smaller bugfix now: we've been implementing the
mostly the same thing :)

Greetings,
janneke


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-build-Also-cross-compile-in-json-directory.patch --]
[-- Type: text/x-patch, Size: 779 bytes --]

From db0eaceadfb3307c347143fbc5a8a985a0159280 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 4 Mar 2020 11:17:02 +0100
Subject: [PATCH] build: Also cross-compile in json directory.

* json/Makefile.am (.scm.go): Add missing $(GUILE_TARGET).
---
 json/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/json/Makefile.am b/json/Makefile.am
index adf5972..765178b 100644
--- a/json/Makefile.am
+++ b/json/Makefile.am
@@ -36,4 +36,4 @@ CLEANFILES = $(GOBJECTS)
 GUILE_WARNINGS = -Wunbound-variable -Warity-mismatch -Wformat
 SUFFIXES = .scm .go
 .scm.go:
-	$(top_builddir)/env $(GUILD) compile $(GUILE_WARNINGS) -o "$@" "$<"
+	$(top_builddir)/env $(GUILD) compile $(GUILE_TARGET) $(GUILE_WARNINGS) -o "$@" "$<"
-- 
2.26.0


[-- Attachment #3: Type: text/plain, Size: 152 bytes --]


-- 
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

Re: guile-json cross-build fix

[Aleix Conchillo Flaqué]

On Thu, Apr 9, 2020 at 12:00 AM Jan Nieuwenhuizen <janneke@gnu.org> wrote:

> Aleix Conchillo Flaqué writes:
>
> Hello Aleix,
>
> > Oh... I know what happened. I used to push commits to a private server
> > that then would push to github and savannah witha commit hook, but I
> > don't have that anymore so I have not been updating savannah.
>
> Ah, that explains things!
>
> >  > Would you mind do it on master?
> >
> >  As far as I can see, I'm up to date
> >
> >      http://git.savannah.nongnu.org/cgit/guile-json.git/log
> >
> http://git.savannah.nongnu.org/cgit/guile-json.git/commit/?id=c95a72735ceb2506ec2a0c1cf7deaf33868a262c
> >
> > Should be updated now. My bad, sorry about that.
>
> Find attached; only a smaller bugfix now: we've been implementing the
> mostly the same thing :)
>
>
Thanks! Applied.

Aleix