[PATCH] gnu: gzochi: Update to 0.10.

[PATCH] gnu: gzochi: Update to 0.10.

[Julian Graham]

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

Linted, built, inspected by hand. Let me know if I've missed anything.

[-- Attachment #2: 0001-gnu-gzochi-Update-to-0.10.patch --]
[-- Type: text/x-patch, Size: 2218 bytes --]

From 584a3d62fe7105b90df433e460d0b6232716b1fc Mon Sep 17 00:00:00 2001
From: Julian Graham <joolean@gmail.com>
Date: Sun, 21 Aug 2016 11:10:41 -0400
Subject: [PATCH] gnu: gzochi: Update to 0.10.

* gnu/packages/game-development.scm (gzochi): Update to 0.10.
---
 gnu/packages/game-development.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 0bfd0c5..ba97a64 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1,13 +1,13 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015 Julian Graham <joolean@gmail.com>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Julian Graham <joolean@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -93,14 +93,14 @@ is used in some video games and movies.")
 (define-public gzochi
   (package
     (name "gzochi")
-    (version "0.9")
+    (version "0.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://savannah/gzochi/gzochi-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1nf8naqbc4hmhy99b8n70yswg9j71nh5mfpwwh6d8pdw5mp9b46a"))))
+                "055m7ywgl48ljwxf0kjhl76ldck890y5afdwjhk5s3p65xyaxh0k"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
@@ -116,7 +116,6 @@ is used in some video games and movies.")
     (native-inputs `(("pkgconfig" ,pkg-config)))
     (inputs `(("bdb" ,bdb)
               ("glib" ,glib)
-              ("gmp" ,gmp)
               ("guile" ,guile-2.0)
               ("libmicrohttpd" ,libmicrohttpd)
               ("ncurses" ,ncurses)
-- 
2.5.0

[PATCH] gnu: gzochi: Update to 0.10.

[David Craven]

From: Julian Graham <joolean@gmail.com>

* gnu/packages/game-development.scm (gzochi): Update to 0.10.
---
 gnu/packages/game-development.scm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index 0bfd0c5..ba97a64 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1,13 +1,13 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Tomáš Čech <sleep_walker@suse.cz>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2015 Julian Graham <joolean@gmail.com>
 ;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015 Alex Kost <alezost@gmail.com>
 ;;; Copyright © 2015, 2016 David Thompson <davet@gnu.org>
 ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016 Kei Kebreau <kei@openmailbox.org>
 ;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2016 Julian Graham <joolean@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -93,14 +93,14 @@ is used in some video games and movies.")
 (define-public gzochi
   (package
     (name "gzochi")
-    (version "0.9")
+    (version "0.10")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://savannah/gzochi/gzochi-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1nf8naqbc4hmhy99b8n70yswg9j71nh5mfpwwh6d8pdw5mp9b46a"))))
+                "055m7ywgl48ljwxf0kjhl76ldck890y5afdwjhk5s3p65xyaxh0k"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
@@ -116,7 +116,6 @@ is used in some video games and movies.")
     (native-inputs `(("pkgconfig" ,pkg-config)))
     (inputs `(("bdb" ,bdb)
               ("glib" ,glib)
-              ("gmp" ,gmp)
               ("guile" ,guile-2.0)
               ("libmicrohttpd" ,libmicrohttpd)
               ("ncurses" ,ncurses)
-- 
2.5.0

Re: [PATCH] gnu: gzochi: Update to 0.10.

[David Craven]

Should be:

-;;; Copyright © 2015 Julian Graham <joolean@gmail.com>
+;; Copyright © 2015,2016 Julian Graham <joolean@gmail.com>

Should be mentioned in commit message.

> -              ("gmp" ,gmp)

No need to resend the patch.

Thank you for the update!

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Andreas Enge]

Hello,

thanks for your contribution!

On Sun, Aug 21, 2016 at 11:20:54AM -0400, Julian Graham wrote:
> -              ("gmp" ,gmp)

Could you comment on this? Is it not needed any more? Or does dropping it
removes an optional feature?

Andreas

Re: [PATCH] gnu: gzochi: Update to 0.10.

[David Craven]

Isn't gmp already an implicit input of the gnu-build-system? It still
ends up in the runpath, it's just not required to be an input.

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Julian Graham]

Hi Andreas,

On Sun, Aug 21, 2016 at 12:21 PM, Andreas Enge <andreas@enge.fr> wrote:
> Could you comment on this? Is it not needed any more? Or does dropping it
> removes an optional feature?

It's not needed as a first-order dependency any more - although as
David Craven notes in a separate email, it's a dependency of several
other core parts of Guix (such as Guile).


Regards,
Julian

Re: [PATCH] gnu: gzochi: Update to 0.10.

[David Craven]

Hi Julian,

I hadn't realized that you are the author of gzochi.

What I meant was that gmp end up being referenced by gzochi even dough
it's not explicitly in the inputs field. Are you saying that this
shouldn't be the case then?

guix gc --references $(guix build gzochi)
/gnu/store/00qwdmjrzflh0q4g9n18wcx8nvhhxcj1-bdb-6.2.23
/gnu/store/1c7rrngfbrfspfvwj7vvasvmc1cjqjlh-libltdl-2.4.6
/gnu/store/1qv5i6rfxjc4d0rg7z6r9dapmf85kzmy-gnutls-3.5.2
/gnu/store/2z0lv1px7izrmzxsqi3555yavqa56mkq-libidn-1.32
/gnu/store/3fhnmvbdxlsh64pr3zg4y74x3hlx33qw-libtasn1-4.8
/gnu/store/5992iq1v7arqa14ym3di58n4la0893nv-zlib-1.2.8
/gnu/store/5n16jhjpw494jrq87va51wqsmgaqm0yb-sdl-1.2.15
/gnu/store/7zhj5adf7kq7pr6j46wj1gjdc8vi0mwk-nettle-3.2
/gnu/store/95x5fxvcggyaa8ymjjgv5q0dnzkrign9-guile-2.0.11
/gnu/store/9nifwk709wajpyfwa0jzaa3p6mf10vxs-gcc-4.9.3-lib
/gnu/store/b8i9qnxwd4lsxk0g09xnkgshfn4arpmz-libmicrohttpd-0.9.50
>> /gnu/store/cdkrfbl10kbyyjjw3yfk9hckfw8n1b7g-gmp-6.1.0
/gnu/store/i9yr2vg3ksp7iyvvinwv9js82rgv4l04-libunistring-0.9.6
/gnu/store/l1s4cw9g58hmcpd2qgbckfl228143qzx-glib-2.48.0
/gnu/store/lv1jqm6cd9l265jwnihd48a5n7qxzg4d-libgcrypt-1.7.0
/gnu/store/m9vxvhdj691bq1f85lpflvnhcvrdilih-glibc-2.23
/gnu/store/sncfamh3fjrrdgd950d79g6yml2s6a07-libffi-3.2.1
/gnu/store/wdsqcvk2wrr83w4lyr4acpgscn07w6hy-libgpg-error-1.22
/gnu/store/x09wbcsh8wjc5y9yhc9mwf2a9gjnc0hv-libgc-7.4.2
/gnu/store/xl19qrfzga52vrvp4ncccwjlnrjqwj95-ncurses-6.0
/gnu/store/z4d6bwpzr05ga4mih3nza8k3jal37b5a-gzochi-0.10
/gnu/store/zwc6ck9j0wv80kz5snw5acwb39ws88m1-pcre-8.38

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Julian Graham]

Hi David,

On Sun, Aug 21, 2016 at 5:20 PM, David Craven <david@craven.ch> wrote:
> I hadn't realized that you are the author of gzochi.

Yep!


> What I meant was that gmp end up being referenced by gzochi even dough
> it's not explicitly in the inputs field. Are you saying that this
> shouldn't be the case then?

No, I think that's fine. I'm not an expert with Guix, but I assume the
inclusion of GMP happens transitively - gzochi depends on Guile, Guile
depends on GMP.

Re: [PATCH] gnu: gzochi: Update to 0.10.

[David Craven]

Pushed as c8edd7e65fec92f3656cfdc4332a76a5b78e46af

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Mark H Weaver]

Hi Julian,

Julian Graham <joolean@gmail.com> writes:
> Linted, built, inspected by hand. Let me know if I've missed anything.
>
> From 584a3d62fe7105b90df433e460d0b6232716b1fc Mon Sep 17 00:00:00 2001
> From: Julian Graham <joolean@gmail.com>
> Date: Sun, 21 Aug 2016 11:10:41 -0400
> Subject: [PATCH] gnu: gzochi: Update to 0.10.
>
> * gnu/packages/game-development.scm (gzochi): Update to 0.10.

This update seems to have broken gzochi on i686 and armhf.  Segfaults
and aborts occur during the test suite.

  https://hydra.gnu.org/eval/109095?filter=gzochi

  https://hydra.gnu.org/build/1444785  (i686)
  https://hydra.gnu.org/build/1444781  (armhf)

Build logs are available from those pages.  As I write this, our
continuous integration system has not yet attempted the build on
mips64el, but when it does the results will be available here:

  https://hydra.gnu.org/build/1444727  (mips64el)

Any idea what's going wrong here?

     Thanks,
       Mark

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Julian Graham]

Hi Mark,

On Mon, Aug 22, 2016 at 12:24 AM, Mark H Weaver <mhw@netris.org> wrote:
> This update seems to have broken gzochi on i686 and armhf.  Segfaults
> and aborts occur during the test suite.

Oh dear, that's embarrassing.


>   https://hydra.gnu.org/build/1444785  (i686)
>   https://hydra.gnu.org/build/1444781  (armhf)
>
> Build logs are available from those pages.  As I write this, our
> continuous integration system has not yet attempted the build on
> mips64el, but when it does the results will be available here:
>
>   https://hydra.gnu.org/build/1444727  (mips64el)
>
> Any idea what's going wrong here?

It's almost certainly some sloppy handling of 64-bit types on 32-bit
platforms. (The mips64el build succeeded.)

Sorry for the inconvenience! What are my options for addressing this?
It may take me a few days to get this patched.

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Mark H Weaver]

Julian Graham <joolean@gmail.com> writes:

> Hi Mark,
>
> On Mon, Aug 22, 2016 at 12:24 AM, Mark H Weaver <mhw@netris.org> wrote:
>> This update seems to have broken gzochi on i686 and armhf.  Segfaults
>> and aborts occur during the test suite.
>
> Oh dear, that's embarrassing.
>
>
>>   https://hydra.gnu.org/build/1444785  (i686)
>>   https://hydra.gnu.org/build/1444781  (armhf)
>>
>> Build logs are available from those pages.  As I write this, our
>> continuous integration system has not yet attempted the build on
>> mips64el, but when it does the results will be available here:
>>
>>   https://hydra.gnu.org/build/1444727  (mips64el)
>>
>> Any idea what's going wrong here?
>
> It's almost certainly some sloppy handling of 64-bit types on 32-bit
> platforms. (The mips64el build succeeded.)
>
> Sorry for the inconvenience!

No worries, bugs happen.

> What are my options for addressing this?
> It may take me a few days to get this patched.

If you have 'guix' installed, you can run:

  guix build --system=i686-linux --keep-failed gzochi

to reproduce the same build on your machine, and to leave the failed
build directory in /tmp/guix-build-* for further investigation.

Another approach is to run:

  guix environment --pure --system=i686-linux gzochi

to spawn a subshell with environment variables set to mostly reproduce
the build environment used in the "guix build" command above, but
outside of the isolated build container.  If you can reproduce the
problem this way, it should be far more convenient for debugging and for
development of a fix.

If you can fix the problem on i686, please let me know and I'd be glad
to test the same fix on armhf.

What do you think?

      Mark

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Julian Graham]

On Tue, Aug 23, 2016 at 1:20 AM, Mark H Weaver <mhw@netris.org> wrote:
> If you have 'guix' installed, you can run:
>
>   guix build --system=i686-linux --keep-failed gzochi
>
> to reproduce the same build on your machine, and to leave the failed
> build directory in /tmp/guix-build-* for further investigation.

Neat! I'll give that a shot.


> If you can fix the problem on i686, please let me know and I'd be glad
> to test the same fix on armhf.
>
> What do you think?

Will do. From a Guix perspective, what's better: A new gzochi release
or a patch for Guix to apply against the 0.10 release?

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Mark H Weaver]

Julian Graham <joolean@gmail.com> writes:

> On Tue, Aug 23, 2016 at 1:20 AM, Mark H Weaver <mhw@netris.org> wrote:
>> If you have 'guix' installed, you can run:
>>
>>   guix build --system=i686-linux --keep-failed gzochi
>>
>> to reproduce the same build on your machine, and to leave the failed
>> build directory in /tmp/guix-build-* for further investigation.
>
> Neat! I'll give that a shot.
>
>
>> If you can fix the problem on i686, please let me know and I'd be glad
>> to test the same fix on armhf.
>>
>> What do you think?
>
> Will do. From a Guix perspective, what's better: A new gzochi release
> or a patch for Guix to apply against the 0.10 release?

Either one would be fine for Guix users.  However, for the sake of
non-Guix users and other distros, I would suggest making a new release.
I think it's important that upstream software releases should be
reasonably portable whenever feasible, especially to important
architectures like i686 and armhf.  What do you think?

      Mark

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Julian Graham]

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

Hey Mark,

On Tue, Aug 23, 2016 at 1:44 PM, Mark H Weaver <mhw@netris.org> wrote:
> Either one would be fine for Guix users.  However, for the sake of
> non-Guix users and other distros, I would suggest making a new release.
> I think it's important that upstream software releases should be
> reasonably portable whenever feasible, especially to important
> architectures like i686 and armhf.  What do you think?

Hard to argue with that!

I've made some fixes and cut a new release. Find attached a patch that
updates the `gzochi' package to the new released version. I've tested
the x86_64 and i686 builds as you suggested, and would be much obliged
if you'd try a build for armhf.

Thanks for all the help thus far.


Regards,
Julian

[-- Attachment #2: 0001-gnu-gzochi-Update-to-0.10.1.patch --]
[-- Type: text/x-patch, Size: 1209 bytes --]

From a3d190804bbe8925e12709c18e34e9c2a9ed36e9 Mon Sep 17 00:00:00 2001
From: Julian Graham <joolean@gmail.com>
Date: Thu, 25 Aug 2016 11:08:23 -0400
Subject: [PATCH] gnu: gzochi: Update to 0.10.1.

* gnu/packages/game-development.scm (gzochi): Update to 0.10.1.
---
 gnu/packages/game-development.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index d544a72..3b21e1d 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -93,14 +93,14 @@ is used in some video games and movies.")
 (define-public gzochi
   (package
     (name "gzochi")
-    (version "0.10")
+    (version "0.10.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://savannah/gzochi/gzochi-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "055m7ywgl48ljwxf0kjhl76ldck890y5afdwjhk5s3p65xyaxh0k"))))
+                "1r0cjd3046rqlgwkgxm5ppkb9mya4gyv3980wfqxq8dfznv3pfdl"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-- 
2.5.0

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Mark H Weaver]

Julian Graham <joolean@gmail.com> writes:
> I've made some fixes and cut a new release. Find attached a patch that
> updates the `gzochi' package to the new released version. I've tested
> the x86_64 and i686 builds as you suggested, and would be much obliged
> if you'd try a build for armhf.

I tested gzochi-0.10.1 by applying your proposed patch to current
'master' (commit 8930fe62f0) and building on armhf.  Unfortunately
there's still a problem: test_oid_strategy_allocation fails an
assertion.  See below.

       Mark


==========================================
   gzochid 0.10.1: tests/test-suite.log
==========================================

# TOTAL: 35
# PASS:  34
# SKIP:  0
# XFAIL: 0
# FAIL:  1
# XPASS: 0
# ERROR: 0

.. contents:: :depth: 2

FAIL: test-oids
===============

/oids/strategy/allocation: **
ERROR:test-oids.c:60:test_oid_strategy_allocation: 'gzochid_oids_reserve_block (strategy, &block, NULL)' should be TRUE
FAIL test-oids (exit status: 134)

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Julian Graham]

Hi Mark,

On Thu, Aug 25, 2016 at 3:22 PM, Mark H Weaver <mhw@netris.org> wrote:
> I tested gzochi-0.10.1 by applying your proposed patch to current
> 'master' (commit 8930fe62f0) and building on armhf.  Unfortunately
> there's still a problem: test_oid_strategy_allocation fails an
> assertion.  See below.

I've been testing my code for the past several days using QEMU to
emulate a Versatile Express (Cortex A9) ARM system running Debian
Wheezy. And while I've found and fixed a number of interesting
portability issues, I've yet to be able to reproduce the specific test
failure you saw.

You mentioned on IRC that your armhf build machine is a Wandboard
Quad. Is there anything else you can tell me about it that'd help me
debug further? For example, is it running in big-endian mode?

Thanks for your help and patience thus far.


Regards,
Julian

Re: [PATCH] gnu: gzochi: Update to 0.10.

[Julian Graham]

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

Hey Mark,

> On Thu, Aug 25, 2016 at 3:22 PM, Mark H Weaver <mhw@netris.org> wrote:
>> I tested gzochi-0.10.1 by applying your proposed patch to current
>> 'master' (commit 8930fe62f0) and building on armhf.  Unfortunately
>> there's still a problem: test_oid_strategy_allocation fails an
>> assertion.  See below.

Actually, scratch what I wrote earlier - I did some more testing and I
think I've found the issue. Not related to bittedness or endianness,
just plain old test non-determinism.

I've built and uploaded another provisional release of gzochi 0.10.1,
and updated my Guix patch - find a new version attached. At your (or
another maintainer's) convenience, I'd appreciate another go-round on
Hydra.


Thanks,
Julian

[-- Attachment #2: 0001-gnu-gzochi-Update-to-0.10.1.patch --]
[-- Type: text/x-patch, Size: 1208 bytes --]

From 823e3eaf4869d0803e964a8810d5e7909b8709a9 Mon Sep 17 00:00:00 2001
From: Julian Graham <joolean@gmail.com>
Date: Sat, 3 Sep 2016 13:08:37 -0400
Subject: [PATCH] gnu: gzochi: Update to 0.10.1.

* gnu/packages/game-development.scm (gzochi): Update to 0.10.1.
---
 gnu/packages/game-development.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index d544a72..5e6cf0b 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -93,14 +93,14 @@ is used in some video games and movies.")
 (define-public gzochi
   (package
     (name "gzochi")
-    (version "0.10")
+    (version "0.10.1")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://savannah/gzochi/gzochi-"
                                   version ".tar.gz"))
               (sha256
                (base32
-                "055m7ywgl48ljwxf0kjhl76ldck890y5afdwjhk5s3p65xyaxh0k"))))
+                "166rawdal45kvanhvi0bkzy1d2pwf1p0lzslb287lcnm9vdw97yy"))))
     (build-system gnu-build-system)
     (arguments
      '(#:phases (modify-phases %standard-phases
-- 
2.5.0

Re: [PATCH] gnu: gzochi: Update to 0.10.

[David Craven]

Thanks! Pushed as 7b39b7eb91112616a26a7b5de1d0d4782c83add9.