From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-971520-garchives=archives.gentoo.org@lists.gentoo.org> 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 AF68C1396D1 for <garchives@archives.gentoo.org>; Fri, 8 Sep 2017 15:52:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2B642748E8; Fri, 8 Sep 2017 15:52:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 D22302748E8 for <gentoo-commits@lists.gentoo.org>; Fri, 8 Sep 2017 15:52:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 4C1623416BF for <gentoo-commits@lists.gentoo.org>; Fri, 8 Sep 2017 15:52:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E82F49013 for <gentoo-commits@lists.gentoo.org>; Fri, 8 Sep 2017 15:52:06 +0000 (UTC) From: "Michael Palimaka" <kensington@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org> Message-ID: <1504885918.d82f92ed064996dfb187ef668d74ed5b05546b2d.kensington@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: d82f92ed064996dfb187ef668d74ed5b05546b2d X-VCS-Branch: master Date: Fri, 8 Sep 2017 15:52:06 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ef7b239d-2361-41f0-b087-67eea829cda2 X-Archives-Hash: 3e42d11b6997ffdbbbed785b5836c57f commit: d82f92ed064996dfb187ef668d74ed5b05546b2d Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Aug 27 03:46:55 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Fri Sep 8 15:51:58 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=d82f92ed qt5-build.eclass: create a forwarding header for qtbase Since 5.8, the build system no longer creates a forwarding header causing the system config to be used instead of what was passed to configure. This reverts commit 53e51ab097bd73ec05d56c389bc68da17eaf22d5. Gentoo-bug: 599636 eclass/qt5-build.eclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 8066d84f..c0c5bda8 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -615,12 +615,7 @@ qt5_base_configure() { $([[ ${QT5_MINOR_VERSION} -lt 8 ]] && echo -iconv) # disable everything to prevent automagic deps (part 3) - -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig - - # FIXME - # since 5.8, disabling dbus generates a QT_NO_DBUS in QtCore/qconfig.h, - # thus specify runtime loading of libdbus to avoid the #define - $([[ ${QT5_MINOR_VERSION} -ge 8 ]] && echo -dbus-runtime || echo -no-dbus) + -no-cups -no-evdev -no-tslib -no-icu -no-fontconfig -no-dbus # let portage handle stripping -no-strip @@ -684,6 +679,12 @@ qt5_base_configure() { "${S}"/configure "${conf[@]}" || die "configure failed" popd >/dev/null || die + + if [[ ${QT5_MINOR_VERSION} -ge 8 ]]; then + # a forwarding header is no longer created since 5.8, causing the system + # config to always be used. bug 599636 + cp src/corelib/global/qconfig.h include/QtCore/ || die + fi } # @FUNCTION: qt5_qmake