From nobody Sun Apr 17 13:07:15 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B849411CC76C; Sun, 17 Apr 2022 13:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kh9MR4lZHz3Mbl; Sun, 17 Apr 2022 13:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650200835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nK+HYXp5PKMUVOneBL813tBdJsm9sMrLw9Ix/4ge92c=; b=Tg1oUrnHWZ/IkL7uL4kWHvY6cOvQ1rBTsu9xFb19lIPsk0k3T+ab1YL5BYk6u/YRNW+iuj Lo9iE22zTHAvsiEzcXm6b3S5Xhtc0cxzECo6AsreRBRBTSv7DIyBuzjmXqeZ/9OcIhDyXW G3ANQPD9vsFC6+Z6NtjZXjnpeZtv5Apcy3bs8zL/uEM0MqwK4aeuNxgGm8LAPBqaGz/8Cy aDtELLzo1VMRRp+xRNmSip69XT8e35CzCj08rLdm9C2Lqj42+aWInplus/NtJ5/7yaGv3f n0TOEJ40GZA0S1oyKbSjCM8ttd4uiZmVgC7H5Nv7+o631yudNlNr25UQLXp9/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 83F341EBA4; Sun, 17 Apr 2022 13:07:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23HD7F9x052577; Sun, 17 Apr 2022 13:07:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23HD7Fse052576; Sun, 17 Apr 2022 13:07:15 GMT (envelope-from git) Date: Sun, 17 Apr 2022 13:07:15 GMT Message-Id: <202204171307.23HD7Fse052576@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 837447eabc74 - main - devel/glib20: fix up DOCS generation List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 837447eabc7465795a0832db23f4862b6289fb7c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650200835; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nK+HYXp5PKMUVOneBL813tBdJsm9sMrLw9Ix/4ge92c=; b=BOR4USvX4Owq0rKfyNyRfLO5F4ANTGrp/1unRjUlloE66Pzjl/xp3uuP60ufP4S2PHWUg1 SHw/peEfet5qv24VnXY/L3yVzXOCwTgdvT2a9qq3Fwyn8wCalGs4LSnEAPZ72chKKsDQEO 0bCZv3MU4GC2K6FHOvBGCZv19XHb70Bvn7noa3Qwxellm2xjd4Hpztp3yZDfj8lJdhK2VP nSWq63JDB2m6OyhT2Y0m15AkPcBhK6bD5XyegHzL09j/pZVIYsum/9U7lBBDtWCoRv0Vrb MIloEY+H1XbC6DSHjRABXK3Kiid0QxaJM4T6G8z7ubgxa86rhyMQhuZEQstzUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650200835; a=rsa-sha256; cv=none; b=ChZkMPH4kT995oZD7ENzDyD+xFRihn9k7EWGoG2MqXKymf5763fNUkOq1vHw8hFo4vyJoI O67ZdT+euUeFPZKUTZbi5jSuZ4ZSPXGXEMBjTSofdva7yzafVAJEd38oWjaKXgCFmj2kh9 eHcZcjV/NUTyXn9cVtaUm07xJD8MPSwu0BGZ+sSrvDB2xdqBOyrX9XvOwlDyciCpeWgUzJ 5K7w5PzdT8fNATPB6IvTb0/AsFaoIPqfTV2pZE+dN/ioQ1zk5Jd3kpyoJebZTMpptCLfOH xN0ttwdvH1eTXU2KEMD9a5jAfM+O3IejqbWLHSUGYPAx6e9I4ZnY1CjLJFaY8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=837447eabc7465795a0832db23f4862b6289fb7c commit 837447eabc7465795a0832db23f4862b6289fb7c Author: Adriaan de Groot AuthorDate: 2022-04-17 11:56:19 +0000 Commit: Adriaan de Groot CommitDate: 2022-04-17 13:07:12 +0000 devel/glib20: fix up DOCS generation Try to resolve build issues when generating DOCS. On some systems -- embarrassingly parallel ones, but also seemingly i386 -- the build happens in a wrong order. This is explained in the comment now added to the Makefile. A simple way to trigger the build problem (before this patch) is this: - configure the port - switch to the build-dir - run `ninja -j48 gio-doc` Dependencies for gio-doc are incomplete, and the build fails. I tried to solve this at Meson-level, but all my "obvious" changes to `meson.build` like adding a dependency on `libgdbus_example_objectmanager` to gio/meson.build got me Meson-time errors. Either no extra dependency in the resulting Ninja files, or an error that the type of the dependency was wrong. The ugly way to fix it is to tell ninja -- which does have a general idea about dependencies between targets -- about it. --- devel/glib20/Makefile | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index f643570a17bd..33bb3c4993fc 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -2,7 +2,7 @@ PORTNAME= glib DISTVERSION= 2.70.4 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= GNOME @@ -79,6 +79,20 @@ pre-configure-FAM_ALTBACKEND-on: @${CP} ${FILESDIR}/kqueue_fnm.c ${WRKSRC}/gio/kqueue/kqueue_fnm.c @${CP} ${FILESDIR}/kqueue_fnm.h ${WRKSRC}/gio/kqueue/kqueue_fnm.h +# The generation of GIO documentation depends on a types-document +# generated as part of the dbus-object-manager example. With an +# embarrassingly parallel build, failures like this can happen: +# +# Building documentation for gdbus-object-manager-example +# ERROR: Error in gtkdoc helper script: +# FileNotFoundError: [Errno 2] No such file or directory: '_build/docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example.types' +# +# Meson does not seem to provide a way to express that dependency. +# +# Hack it into the generated ninja build instead. +post-configure-DOCS-on: + @${REINPLACE_CMD} -e '\+^build docs/reference/gio/gdbus-object-manager-example/gdbus-object-manager-example-decl.txt:+s+$$+ || gio/tests/gdbus-object-manager-example/libgdbus-example-objectmanager.so+' ${BUILD_WRKSRC}/build.ninja + post-patch: ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g ; \ s|/usr/share/locale/locale|${LOCALBASE}/share/locale/locale|g' \