From nobody Fri May 3 02:52:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1635187141; cv=none; d=zohomail.com; s=zohoarc; b=A3/iNnQCteO3UlHouqZLX6U23BidM8fC5esXOZLv1F1zDkWHLQHeHBYpIpJ5CF4Q4oCgOJobz8ULSGYbuFNk2VVlSg4lsj06yMm8MfZ77hapSEvep83jKTFG4e7eUjc/M8X0Jbjfv3q0iyKIfERII6wzr/tZ/6Mp5RLV+7magIc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635187141; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=Turh9SSHQmNh6oXRSMsp6caZEINyH3rHb65QRIpvUU4=; b=lfgsIgbe6by5OCrssJxXxBV4t7dwxVeWzoafopew5BtkKUDS8aYmkNN4Kkt5SkdH8nYCTb6tFWqnL2DJD0jBm+Kr1Jwi2FcOVFxQfqmu1bTjO0xRZHwkpuzto04JiKrMbz1HuEhlzXFH26wcXeLg3Q4VgbuuGSqjtsD9VfBKYs0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1635187141523950.046516519591; Mon, 25 Oct 2021 11:39:01 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-266-UDOBrmX1P-ODj6AiCDvong-1; Mon, 25 Oct 2021 14:38:56 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D720E8066F3; Mon, 25 Oct 2021 18:38:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8E52F7832C; Mon, 25 Oct 2021 18:38:48 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D90F81801241; Mon, 25 Oct 2021 18:38:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 19PIb2Na031039 for ; Mon, 25 Oct 2021 14:37:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id C34DC100E107; Mon, 25 Oct 2021 18:37:02 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.39.194.239]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2425C1037F46; Mon, 25 Oct 2021 18:36:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635187140; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=Turh9SSHQmNh6oXRSMsp6caZEINyH3rHb65QRIpvUU4=; b=MjEKAOPPNQ3KWpcGeXFgkR6nm12XO1Jfk39aMru8/pY2JZzOBmjRFejFzJhOKL9ov0HK93 Dx5l+6hFegN07rDgPi6imUISI0x5uzggHsd1oW7p9cUeKvTsDJv2E0C0RvUSTli3pC2KyF f/EL2eYz+ijO1YCKBmTm1h+ngItq4f4= X-MC-Unique: UDOBrmX1P-ODj6AiCDvong-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: libvir-list@redhat.com Subject: [PATCH] docs: fix docs output path with meson 0.60.0 Date: Mon, 25 Oct 2021 19:36:54 +0100 Message-Id: <20211025183654.543157-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1635187142140100001 The meson 0.60.0 release introduced a bug with the '/' operator when using an empty path component. '/foo' / '' will now result in '/foo' not '/foo/' https://github.com/mesonbuild/meson/issues/9450 This breaks libvirt because xsltproc requires the trailing '/' on the output directory path. Fortunately the explicit 'join_paths' function is not affected by the regression Signed-off-by: Daniel P. Berrang=C3=A9 --- Pushed as a CI / build fix docs/meson.build | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/meson.build b/docs/meson.build index cbc138fa1f..fb6e0029d0 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -1,7 +1,9 @@ docs_html_dir =3D docdir / 'html' =20 # xsltproc requires that the -o path ends with '/' -docs_builddir =3D meson.current_build_dir() / '' +# Not using '/' operator due to bug in meson 0.60.0 +# https://github.com/mesonbuild/meson/issues/9450 +docs_builddir =3D join_paths(meson.current_build_dir(), '') =20 docs_assets =3D [ 'android-chrome-192x192.png', --=20 2.31.1