From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id mFl/JTbzAGfMAwEAqHPOHw:P1 (envelope-from ) for ; Sat, 05 Oct 2024 08:05:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id mFl/JTbzAGfMAwEAqHPOHw (envelope-from ) for ; Sat, 05 Oct 2024 10:05:10 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=YqH2k5eq; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=fhHgWKJz; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728115510; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=l6VBxybq6CyKG1+LrSuJ/GL2upgTBC6knv+0VYRl69U=; b=mhMwxn7du4ycZVZ9e4kPtKSz9G987X/3AKu8RTYYmfdXu4FPSaS68c6GQhROd++Y6BCe2N Rt+2Wd7XfZdbxMKRdl20JJjXRoeywgCNrxzsY4BYjC5nPLRtY8DquymknI39PgLAaohXjc TRWJ+INZP1N6RuaBPvUPhiewRoJAFpmK4mHO79PDvXsFIlMn+vOTpY5qfdVkJgdc+YPEis N7l121Mz95bPb2dqsG84OP8wzsd14+JVcG0iQ0Jov2hrBZOyWtVhJCUyY19cj37puGNsUU e9xBTAMkF5evNZJkAsctzyxCVzHa6B06nqq5cNBxmD1mvbXWEm48Ve1ez+uJQg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728115510; a=rsa-sha256; cv=none; b=OOD001gDa8CNe0XCgMAd7YAJ1rOJDrYT0NmBlnTPV9N4FZ4ht1YsLW1AgU0MTx0zLVeD2a T1uBLEcwy5QG0hjEiJhY6EBk43ZPWnqqLl9XohqRlb6JnWJz9ZVSkKol36C2N9zllKe6S+ 2rAj1tHqCIlhHHz42bp2kXSFm1RNe864s1hSYd3A5okOXyfGINty8i2YpH3qOAKR5crg4o 16mkU1k4B7TtDLeleZzUTWLRYXoR79ycBkX4qiKvwtRsKQemMIbySkJ7GVTmLhITS3Cp5h /nwIu8Wa9B6HsXcDnMcVV+h43qTixN5HjbES4iRkZ8fdR/qCkWl/x/pt3Q248Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=YqH2k5eq; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=fhHgWKJz; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 53D072A74 for ; Sat, 05 Oct 2024 10:05:10 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1swzlh-0006O0-K0; Sat, 05 Oct 2024 04:04: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 ) id 1swzlf-0006Mc-S8 for guix-patches@gnu.org; Sat, 05 Oct 2024 04:03:59 -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 ) id 1swzlf-0004Ga-CG for guix-patches@gnu.org; Sat, 05 Oct 2024 04:03:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=l6VBxybq6CyKG1+LrSuJ/GL2upgTBC6knv+0VYRl69U=; b=YqH2k5eq5kf+gK55NhT2SEnS8Fxw9dYbisnLwShs1tjHSIlj1rLkpdmqBqPOl6pRLfesp2lA3bjKL5nEzMVZxjG/1fQySWNvhN1syD7+KJ3ltJduHIaesOAKDZE2xQ4X021ShJ7ZxBne8GhugQzTLPOkVNx3Bge+hCFD7EbUcv+vQsr36b4kwML6hjG5jhkMX6Vo/SeSOa2HuAoLP4PXlk181ZeUNUr0kLxPV5O18mi4Gqne7oKo/X2jLRX98i4tJ6LvwFA7UTifXmyvWSwO9CBAxP8PMI9KtjQb9NNwGB56e5CSs8B4UE+z1jTpkkCzqCaDA/o4sUFEhjGcBs2pLg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1swzlj-00062S-1U; Sat, 05 Oct 2024 04:04:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73610] [PATCH gnome-team v2 3/4] gnu: bootstrap glib and gobject against each other. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Sat, 05 Oct 2024 08:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73610 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73610@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 73610-submit@debbugs.gnu.org id=B73610.172811539523132 (code B ref 73610); Sat, 05 Oct 2024 08:04:03 +0000 Received: (at 73610) by debbugs.gnu.org; 5 Oct 2024 08:03:15 +0000 Received: from localhost ([127.0.0.1]:37250 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1swzkx-000612-1n for submit@debbugs.gnu.org; Sat, 05 Oct 2024 04:03:15 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:49531) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1swzks-00060U-T7 for 73610@debbugs.gnu.org; Sat, 05 Oct 2024 04:03:11 -0400 Received: by mail-wr1-f66.google.com with SMTP id ffacd0b85a97d-37ccf0c0376so1804741f8f.3 for <73610@debbugs.gnu.org>; Sat, 05 Oct 2024 01:03:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728115326; x=1728720126; darn=debbugs.gnu.org; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :from:to:cc:subject:date:message-id:reply-to; bh=l6VBxybq6CyKG1+LrSuJ/GL2upgTBC6knv+0VYRl69U=; b=fhHgWKJz+rad9BNnpYUZrloMcKhUFjrOwRBd7/3wF0iyBvXNqemM9p4IYgk5K8W+B+ SKvvJv9p4OXzXLG0hxbon8c0bzkWr6SxAhmlgw3y98La4ql7q2lJIHcRqAa2KIRbJft9 TdopBVC/NgUZhz1dv8LTHt6A1rc09evxa1n7CpKNnO9jvv2P/kNBMMjN7nOD570MeCRy 0b3otR/XbAHJJLjslQxktMDlZyWZbfkWAyF7/AJZbhPvUXMwvaNWsrfyNhBoHlHGmNOE vVZksPkYNeKLDZtGubqrBVogufAkzmTEbndQUfezGbIjWn4EkNuWYarJpFF1Uvzkd5uL YQZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728115326; x=1728720126; h=mime-version:to:subject:date:from:references:in-reply-to:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=l6VBxybq6CyKG1+LrSuJ/GL2upgTBC6knv+0VYRl69U=; b=ofeEf+hpw5wylgKQlKr/z5zfLDbsQREpbgeKFQQ13xMD4ayftaL4lY5tPJ4Ai9OXqj vrd/HgFpjYRGMQ8dXVfQvdAry/aYu/etdvm6jy0ms3Mo4L0QeirhY8DoHEM3WphJMEGa pHyMMkHovD85DtgAF5X6wArQiagqHPIK76jC01dVJjw2x2LJstqFf2lSG6PSPNq+E1aI /iI5Qd2/1dVwI4Exv221l2tgq9orBiRhPTLYc+NaHEY8FMUX5491Es4ydRvbDygONgAu mKnN3hvOlT/gcROkALEYTshSG+hm583hpnhbhaeq9njqtBUeQ6So9qt6B43AbYscNEnn 6BZg== X-Gm-Message-State: AOJu0YxTws7trdFmfExnKeNQJgnJE0q4M0o+ZERzP48VXUzpp4BLqgeU F/Ixl2JdllRQTM38aCR3CgNL6Ra+CO1zsQveJJzleWiFU+vZ1G7hTVAvMwU8 X-Google-Smtp-Source: AGHT+IFRTTcC2bOtsqVvTLwAqVYDGW+4I1WHxK1rAS3QGsuDSXFtaOUT5ZnuKCl8Luh7K3MUsWE9hw== X-Received: by 2002:a5d:5245:0:b0:37c:d4e8:2c6a with SMTP id ffacd0b85a97d-37d0e8de992mr3437347f8f.51.1728115325640; Sat, 05 Oct 2024 01:02:05 -0700 (PDT) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42f86b4aa15sm34044865e9.45.2024.10.05.01.02.05 for <73610@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 01:02:05 -0700 (PDT) Message-ID: <329338bfa35d1b46c3280c0ca933fe20d23d4d56.1728115303.git.liliana.prikler@gmail.com> In-Reply-To: References: From: Liliana Marie Prikler Date: Sat, 5 Oct 2024 09:55:46 +0200 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: 1.16 X-Spam-Score: 1.16 X-Migadu-Queue-Id: 53D072A74 X-Migadu-Scanner: mx13.migadu.com X-TUID: D2V7QUGX+fFV As of GLib 2.82, introspection data in GLib is built as part of the package, requiring gobject-introspection. * gnu/packages/gnome.scm (glib-minimal, gobject-introspection-minimal): New variables. (glib): Use gobject-introspection-minimal for bootstrap. (gobject-introspection-minimal): Use glib-minimal for bootstrap. (gobject-introspection): Fix propagations. --- gnu/packages/glib.scm | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b13b2c659a..15b0c03de6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -242,7 +242,7 @@ (define-public dbus-verbose the @code{DBUS_VERBOSE} environment variable is set to @samp{1}. For more information, refer to the @samp{dbus-daemon(1)} man page."))) -(define glib +(define glib-minimal (package (name "glib") (version "2.82.1") @@ -524,6 +524,21 @@ (define glib (license license:lgpl2.1+) (properties '((hidden? . #t))))) +(define glib + (let ((base glib-minimal)) + (package/inherit base + (native-inputs + (modify-inputs (package-native-inputs base) + (prepend gobject-introspection-minimal))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:phases phases) + #~(modify-phases #$phases + ;; GI tests require installed libraries + (delete 'check) + (add-after 'install 'check + (assoc-ref #$phases 'check))))))))) + (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. @@ -602,7 +617,7 @@ (define (correct-library-name-phase python name) (string-append name target-suffix)) (rename-file native-name target-name))) -(define gobject-introspection +(define gobject-introspection-minimal (package (name "gobject-introspection") (version "1.82.0") @@ -659,15 +674,14 @@ (define gobject-introspection `(,@(if (%current-target-system) `(("python" ,python)) '()) - ("glib" ,glib "bin") + ("glib" ,glib-minimal "bin") ("pkg-config" ,pkg-config) ("bison" ,bison) ("flex" ,flex))) (inputs - `(("python" ,python) - ("zlib" ,zlib))) + (list python zlib)) (propagated-inputs - (list glib + (list glib-minimal ;; In practice, GIR users will need libffi when using ;; gobject-introspection. libffi)) @@ -691,6 +705,16 @@ (define gobject-introspection ;; For tools. license:gpl2+)))) +(define gobject-introspection + (let ((base gobject-introspection-minimal)) + (package/inherit base + (native-inputs + (modify-inputs (package-native-inputs base) + (replace "glib" glib))) + (propagated-inputs + (modify-inputs (package-propagated-inputs base) + (replace "glib" glib)))))) + (define intltool (package (name "intltool") -- 2.46.0