Re: [Guile-avahi-bugs] Fix build with Guile 3.

[Ludovic Courtès]

Hi Mathieu!

Mathieu Othacehe <othacehe@gnu.org> skribis:

> Here are some patches to fix Guile-Avahi build. I removed gnulib
> dependency that does not seem required anymore. I also removed the
> custom allocator that causes issues and fixed the tests.

This is incredible!  For making the first Guile-Avahi patches has seen
in more than a decade, you have just won admin rights on the project;
congrats!  :-)

> From 818c07525b3e6adbd195b8742518e1c60669d1db Mon Sep 17 00:00:00 2001
> From: Mathieu Othacehe <othacehe@gnu.org>
> Date: Mon, 26 Oct 2020 10:53:51 +0100
> Subject: [PATCH 1/4] Remove gnulib dependency.
>
> * Makefile.am (SUBDIRS): Remove lib.
> * configure.ac: Remove gnulib init.
> * src/Makefile.am: Do not link with gnulib.
> * src/utils.c: Remove HAVE_ARPA_INET_H conditionnals.

Good idea.

> From 018e45329887a61cc0139b8d8248aeae535f70ed Mon Sep 17 00:00:00 2001
> From: Mathieu Othacehe <othacehe@gnu.org>
> Date: Mon, 26 Oct 2020 11:00:50 +0100
> Subject: [PATCH 2/4] Do not use a custom memory allocator.
>
> * src/common.c: Remove the custom memory allocator.

Should be fine.

> From 70c46856ef1296a75952c5a95702a5aa2c60737c Mon Sep 17 00:00:00 2001
> From: Mathieu Othacehe <othacehe@gnu.org>
> Date: Mon, 26 Oct 2020 10:55:21 +0100
> Subject: [PATCH 3/4] Fix tests.
>
> * modules/avahi/test.scm (assert-exit): New procedure.
> * tests/errors.scm: Use assert-exit instead of exit.
> * tests/guile-poll.scm: Ditto. Use 'none instead of _IONBF.
> * tests/publish+browse.scm: Use assert-exit instead of exit.
> * tests/publish+resolve.scm: Use assert-exit instead of exit. Use INADDR_ANY
> instead of INADDR_LOOPBACK.
> * tests/publish.scm: Ditto.
> * tests/simple-poll.scm: Use assert-exit instead of exit.
> * tests/threaded-poll.scm: Ditto.

[...]

> +(define (assert-exit x)
> +  (primitive-exit (if x 0 1)))
> +
>  (define %service-type
>    ;; The default service type used for testing.
>    "_guile-avahi._tcp")
> diff --git a/tests/errors.scm b/tests/errors.scm
> index 69effcf..4562f01 100644
> --- a/tests/errors.scm
> +++ b/tests/errors.scm
> @@ -49,17 +49,17 @@
>                (entry-group-state group)
>  
>                ;; not reached (normally)
> -              (exit #f)))
> +              (assert-exit #f)))

I’m not sure why this change is needed.  Is it because the 'quit
exception would be caught somewhere and thus ‘exit’ has no effect?

Anyhow LGTM!

> From cd8f34eb1b8ab8604d9fd6eadb9168e5488a89bb Mon Sep 17 00:00:00 2001
> From: Mathieu Othacehe <othacehe@gnu.org>
> Date: Mon, 26 Oct 2020 11:02:03 +0100
> Subject: [PATCH 4/4] Fix make check.
>
> * configure.ac: Remove AC_PREREQ and add color-tests to automake init list.
> * tests/Makefile.am (SCM_TESTS, TEST_EXTENSIONS, AM_TESTS_ENVIRONMENT,
> SCM_LOG_COMPILER, AM_SCM_LOG_FLAGS): New variables.
> * build-aux/config.rpath: New file.

[...]

> +++ b/build-aux/config.rpath

No need to add this file: it’s automatically added by ‘automake’.

Otherwise LGTM, thank you!

Ludo’.