Message ID | da11d1165f646f350af8e8b4fc614f374dc02f59.1689690897.git.janneke@gnu.org |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6D6A027BBE2; Tue, 18 Jul 2023 15:45:27 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A180027BBED for <patchwork@mira.cbaines.net>; Tue, 18 Jul 2023 15:45:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1qLlvl-0001Tf-Rk; Tue, 18 Jul 2023 10:44:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qLluw-0000l5-7s for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:11 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qLlut-000199-FF for guix-patches@gnu.org; Tue, 18 Jul 2023 10:43:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qLlut-0006lg-BU; Tue, 18 Jul 2023 10:43:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64711] [PATCH 40/43] gnu: pango: Support build for the Hurd. Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 14:43:07 +0000 Resent-Message-ID: <handler.64711.B64711.168969136525862@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64711 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64711@debbugs.gnu.org Cc: Liliana Marie Prikler <liliana.prikler@gmail.com>, Maxim Cournoyer <maxim.cournoyer@gmail.com>, Raghav Gururajan <rg@raghavgururajan.name> X-Debbugs-Original-Xcc: Liliana Marie Prikler <liliana.prikler@gmail.com>, Maxim Cournoyer <maxim.cournoyer@gmail.com>, Raghav Gururajan <rg@raghavgururajan.name> Received: via spool by 64711-submit@debbugs.gnu.org id=B64711.168969136525862 (code B ref 64711); Tue, 18 Jul 2023 14:43:07 +0000 Received: (at 64711) by debbugs.gnu.org; 18 Jul 2023 14:42:45 +0000 Received: from localhost ([127.0.0.1]:53911 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qLluW-0006iy-Qd for submit@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <janneke@gnu.org>) id 1qLluS-0006he-4x for 64711@debbugs.gnu.org; Tue, 18 Jul 2023 10:42:40 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <janneke@gnu.org>) id 1qLluM-000123-Tw; Tue, 18 Jul 2023 10:42:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=1XTw5lwn6j3zzoqpm7ZUwKBx8ZsP4Og8+GcHcBTGCAw=; b=Zq2oEC9qr1v1cp9895GT O3ilh52rsOkUsfhSs+SDpuNK1XjPczNqr9x6nf98zYhV4QoQJpLJZYpY9KqfgPAQf7zSTqJjPvLJw y8pktOxKTdyr+xoqeRfU94T7m8D0DmspgJiDILjOy8bIPpS/08g7xYzCmj85YpvrRy5dBz8LBQvk1 h0rDc8FYeZwNk82kMUIJy3lW/xrmBqi4E55uHyMiaye66ZvB7nbocgMY15XgVVO1eECNz2bmR8WR3 toujnLnl2135KPJHGCvnIdwSTtRx8toVzNrfYGmqxB+E+95bt8aRAeW5ox4KMsDz3GupF2WYYdYrB RSiE/Q+9EPLS5A==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from <janneke@gnu.org>) id 1qLluM-0004hp-Dj; Tue, 18 Jul 2023 10:42:34 -0400 From: Janneke Nieuwenhuizen <janneke@gnu.org> Date: Tue, 18 Jul 2023 16:40:33 +0200 Message-Id: <da11d1165f646f350af8e8b4fc614f374dc02f59.1689690897.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <cover.1689690897.git.janneke@gnu.org> References: <cover.1689690897.git.janneke@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
Series |
Fix builds and skip failing tests for the Hurd.
|
|
Commit Message
Janneke Nieuwenhuizen
July 18, 2023, 2:40 p.m. UTC
* gnu/packages/gtk.scm (pango)[native-inputs]: Do not include gobject-introspection when building for the Hurd. --- gnu/packages/gtk.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
Comments
Hi Janneke, Thanks for your efforts on this. Janneke Nieuwenhuizen <janneke@gnu.org> writes: > * gnu/packages/gtk.scm (pango)[native-inputs]: Do not include > gobject-introspection when building for the Hurd. > --- > gnu/packages/gtk.scm | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm > index 853696c7f5..15dea2852b 100644 > --- a/gnu/packages/gtk.scm > +++ b/gnu/packages/gtk.scm > @@ -401,12 +401,14 @@ (define-public pango > (list bash-minimal > zlib)) > (native-inputs > - (list `(,glib "bin") ;glib-mkenums, etc. > - gobject-introspection ;g-ir-compiler, etc. > - help2man > - perl > - pkg-config > - python-wrapper)) > + `((,glib "bin") ;glib-mkenums, etc. > + ,@(if (target-hurd?) > + '() > + (list gobject-introspection)) ;g-ir-compiler, etc. > + ,help2man > + ,perl > + ,pkg-config > + ,python-wrapper)) Stylistically, I think it'd be better to use append (and 'if') here than quasiquotes (to avoid having to unquote all inputs). Otherwise it LGTM.
Maxim Cournoyer writes: Hi Maxim, > Thanks for your efforts on this. Sure. It's been fun, but a lot of work (world rebuilds) indeed. Things will get a lot better once we have CI for these native Hurd builds. > Janneke Nieuwenhuizen <janneke@gnu.org> writes: > >> * gnu/packages/gtk.scm (pango)[native-inputs]: Do not include >> gobject-introspection when building for the Hurd. >> --- >> gnu/packages/gtk.scm | 14 ++++++++------ >> 1 file changed, 8 insertions(+), 6 deletions(-) >> >> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm >> index 853696c7f5..15dea2852b 100644 >> --- a/gnu/packages/gtk.scm >> +++ b/gnu/packages/gtk.scm >> @@ -401,12 +401,14 @@ (define-public pango >> (list bash-minimal >> zlib)) >> (native-inputs >> - (list `(,glib "bin") ;glib-mkenums, etc. >> - gobject-introspection ;g-ir-compiler, etc. >> - help2man >> - perl >> - pkg-config >> - python-wrapper)) >> + `((,glib "bin") ;glib-mkenums, etc. >> + ,@(if (target-hurd?) >> + '() >> + (list gobject-introspection)) ;g-ir-compiler, etc. >> + ,help2man >> + ,perl >> + ,pkg-config >> + ,python-wrapper)) > > Stylistically, I think it'd be better to use append (and 'if') here than > quasiquotes (to avoid having to unquote all inputs). Okay, I can change it to (cons `(,glib "bin") ;glib-mkenums, etc. (append (if (target-hurd?) '() (list gobject-introspection)) ;g-ir-compiler, etc. (list help2man perl pkg-config python-wrapper))) > Otherwise it LGTM. Thanks!
Hi, Janneke Nieuwenhuizen <janneke@gnu.org> writes: [...] > Okay, I can change it to > > (cons `(,glib "bin") ;glib-mkenums, etc. > (append (if (target-hurd?) > '() > (list gobject-introspection)) ;g-ir-compiler, etc. > (list help2man > perl > pkg-config > python-wrapper))) You can avoid 'cons' by moving `(,glib "bin") to the front of the trailing list (the one starting with help2man ...), I think.
Maxim Cournoyer writes: Hello, > Janneke Nieuwenhuizen <janneke@gnu.org> writes: > > [...] > >> Okay, I can change it to >> >> (cons `(,glib "bin") ;glib-mkenums, etc. >> (append (if (target-hurd?) >> '() >> (list gobject-introspection)) ;g-ir-compiler, etc. >> (list help2man >> perl >> pkg-config >> python-wrapper))) > > You can avoid 'cons' by moving `(,glib "bin") to the front of the > trailing list (the one starting with help2man ...), I think. Eh..I think that I don't understand; you mean moving `(,glib ,bin) after gobject-introspection like this? (append (if (target-hurd?) '() (list gobject-introspection)) ;g-ir-compiler, etc. (list `(,glib "bin") ;glib-mkenums, etc. help2man perl pkg-config python-wrapper))) That will trigger a rebuild that I would like to avoid. We could avoid cons by doing (append (list `(,glib "bin")) ;glib-mkenums, etc. (if (target-hurd?) '() (list gobject-introspection)) ;g-ir-compiler, etc. (list help2man perl pkg-config python-wrapper)) perhaps the best option? Greetings, Janneke
Hi Janneke, Janneke Nieuwenhuizen <janneke@gnu.org> writes: > Maxim Cournoyer writes: > > Hello, > >> Janneke Nieuwenhuizen <janneke@gnu.org> writes: >> >> [...] >> >>> Okay, I can change it to >>> >>> (cons `(,glib "bin") ;glib-mkenums, etc. >>> (append (if (target-hurd?) >>> '() >>> (list gobject-introspection)) ;g-ir-compiler, etc. >>> (list help2man >>> perl >>> pkg-config >>> python-wrapper))) >> >> You can avoid 'cons' by moving `(,glib "bin") to the front of the >> trailing list (the one starting with help2man ...), I think. > > Eh..I think that I don't understand; you mean moving `(,glib ,bin) after > gobject-introspection like this? > > (append (if (target-hurd?) > '() > (list gobject-introspection)) ;g-ir-compiler, etc. > (list > `(,glib "bin") ;glib-mkenums, etc. > help2man > perl > pkg-config > python-wrapper))) > > That will trigger a rebuild that I would like to avoid. Ah, apologies, I had not thought about this causing rebuilds. > We could avoid cons by doing > > (append (list `(,glib "bin")) ;glib-mkenums, etc. > (if (target-hurd?) > '() > (list gobject-introspection)) ;g-ir-compiler, etc. > (list > help2man > perl > pkg-config > python-wrapper)) > > perhaps the best option? Either ways are fine, sorry for the noise :-).
Maxim Cournoyer writes: Hi Maxim, > Janneke Nieuwenhuizen <janneke@gnu.org> writes: > >> Maxim Cournoyer writes: >> >> Hello, >> >>> Janneke Nieuwenhuizen <janneke@gnu.org> writes: >>> >>> [...] [..] >> That will trigger a rebuild that I would like to avoid. > > Ah, apologies, I had not thought about this causing rebuilds. Yeah, tricky. >> We could avoid cons by doing >> >> (append (list `(,glib "bin")) ;glib-mkenums, etc. >> (if (target-hurd?) >> '() >> (list gobject-introspection)) ;g-ir-compiler, etc. >> (list >> help2man >> perl >> pkg-config >> python-wrapper)) >> >> perhaps the best option? > > Either ways are fine, sorry for the noise :-). No problem, thanks for chiming in and caring enough about stylistics! I like the last variant probably slightly better, so I'll keep that for harfbuzz and pango. Greetings, Janneke
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 853696c7f5..15dea2852b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -401,12 +401,14 @@ (define-public pango (list bash-minimal zlib)) (native-inputs - (list `(,glib "bin") ;glib-mkenums, etc. - gobject-introspection ;g-ir-compiler, etc. - help2man - perl - pkg-config - python-wrapper)) + `((,glib "bin") ;glib-mkenums, etc. + ,@(if (target-hurd?) + '() + (list gobject-introspection)) ;g-ir-compiler, etc. + ,help2man + ,perl + ,pkg-config + ,python-wrapper)) (synopsis "Text and font handling library") (description "Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text