GNU bug report logs - #64711
[PATCH 00/45] Fix builds and skip failing tests for the Hurd.

Previous Next

Package: guix-patches;

Reported by: Janneke Nieuwenhuizen <janneke <at> gnu.org>

Date: Tue, 18 Jul 2023 14:39:02 UTC

Severity: normal

Tags: patch

Done: Janneke Nieuwenhuizen <janneke <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Janneke Nieuwenhuizen <janneke <at> gnu.org>
Cc: Raghav Gururajan <rg <at> raghavgururajan.name>, 64711 <at> debbugs.gnu.org, Liliana Marie Prikler <liliana.prikler <at> gmail.com>
Subject: [bug#64711] [PATCH 39/43] gnu: harfbuzz: Support build for the Hurd.
Date: Tue, 18 Jul 2023 16:13:37 -0400
Hi,

Janneke Nieuwenhuizen <janneke <at> gnu.org> writes:

> * gnu/packages/gtk.scm (harfbuzz)[native-inputs]: Do not include
> gobject-introspection when building for the Hurd.
> ---
>  gnu/packages/gtk.scm | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index eb69a88221..853696c7f5 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -276,11 +276,13 @@ (define-public harfbuzz
>       ;; There are all in the Requires or Requires.private field of '.pc'.
>       (list glib graphite2 icu4c))
>      (native-inputs
> -     (list `(,glib "bin")               ;for glib-mkenums
> -           gobject-introspection
> -           pkg-config
> -           python-wrapper
> -           which))
> +     `((,glib "bin")               ;for glib-mkenums
> +       ,@(if (target-hurd?)
> +             '()
> +             (list gobject-introspection))
> +       ,pkg-config
> +       ,python-wrapper
> +       ,which))

Here also (basically when it's touching label-free inputs), I'd use
append with a conditional to avoid the unquote noise.

Otherwise LGTM.

-- 
Thanks,
Maxim




This bug report was last modified 1 year and 363 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.