From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE1EF138334 for ; Mon, 17 Dec 2018 16:30:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54F7EE0B1C; Mon, 17 Dec 2018 16:30:03 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2B56FE0B1C for ; Mon, 17 Dec 2018 16:30:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA8F4335C58 for ; Mon, 17 Dec 2018 16:30:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1190742F for ; Mon, 17 Dec 2018 16:29:58 +0000 (UTC) From: "Mart Raudsepp" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mart Raudsepp" Message-ID: <1545064168.b5ca9f41113568d3687c1fb24bde824e8044a7ee.leio@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/glib/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/glib/glib-2.58.1.ebuild X-VCS-Directories: dev-libs/glib/ X-VCS-Committer: leio X-VCS-Committer-Name: Mart Raudsepp X-VCS-Revision: b5ca9f41113568d3687c1fb24bde824e8044a7ee X-VCS-Branch: master Date: Mon, 17 Dec 2018 16:29:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a7398e56-ce3b-4a3c-a15b-10cf14d00d4f X-Archives-Hash: 7828169309e2a3f2ae6a04a60d4619ff commit: b5ca9f41113568d3687c1fb24bde824e8044a7ee Author: Mart Raudsepp gentoo org> AuthorDate: Mon Dec 17 16:29:03 2018 +0000 Commit: Mart Raudsepp gentoo org> CommitDate: Mon Dec 17 16:29:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5ca9f41 dev-libs/glib: fix build without dev-util/gtk-doc Closes: https://bugs.gentoo.org/673336 Signed-off-by: Mart Raudsepp gentoo.org> Package-Manager: Portage-2.3.52, Repoman-2.3.11 dev-libs/glib/glib-2.58.1.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dev-libs/glib/glib-2.58.1.ebuild b/dev-libs/glib/glib-2.58.1.ebuild index 5d7bc1f6a95..20eae2bd2eb 100644 --- a/dev-libs/glib/glib-2.58.1.ebuild +++ b/dev-libs/glib/glib-2.58.1.ebuild @@ -128,6 +128,12 @@ src_prepare() { # gdbus-codegen is a separate package eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch + # Tarball doesn't come with gtk-doc.make and we can't unconditionally depend on dev-util/gtk-doc due + # to circular deps during bootstramp. If actually not building gtk-doc, an empty file will do fine as + # well - this is also what upstream autogen.sh does if gtkdocize is not found. If gtk-doc is installed, + # eautoreconf will call gtkdocize, which overwrites the empty gtk-doc.make with a full copy. + touch gtk-doc.make + gnome2_src_prepare epunt_cxx }