Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753454AbbKBNrE (ORCPT ); Mon, 2 Nov 2015 08:47:04 -0500 Received: from mga03.intel.com ([134.134.136.65]:35244 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751633AbbKBNq5 (ORCPT ); Mon, 2 Nov 2015 08:46:57 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,234,1444719600"; d="scan'208,223";a="676645390" From: Thiago Macieira To: Michal Marek Cc: Alexey Brodkin , "linux-kernel@vger.kernel.org" Subject: Re: make xconfig no longer works in Fedora Date: Mon, 02 Nov 2015 08:46:55 -0500 Message-ID: <2978371.kMj1QX9251@tjmaciei-mobl4> Organization: Intel Corporation User-Agent: KMail/4.14.10 (Linux/4.2.1-1-desktop; KDE/4.14.12; x86_64; ; ) In-Reply-To: <56373CBB.3010801@suse.com> References: <1446295161.4394.81.camel@synopsys.com> <1540852.ryHORPH4E7@tjmaciei-mobl4> <56373CBB.3010801@suse.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="nextPart1970081.WyKkAUefPf" Content-Transfer-Encoding: 7Bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4232 Lines: 111 This is a multi-part message in MIME format. --nextPart1970081.WyKkAUefPf Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" On Monday 02 November 2015 11:36:43 Michal Marek wrote: > On 2015-11-02 04:20, Thiago Macieira wrote: > > - qtver=`qmake -query QT_VERSION` || { \ > > + qtver=`qmake -query QT_VERSION` || \ > > + qtver=`qmake-qt5 -query QT_VERSION` || \ > > + qtver=`qmake-qt4 -query QT_VERSION` || { \ > > The qtlibdir= etc assignments below still use qmake directly, plus this > will print an error if the command is not called "qmake." As Alexey > says, we do not need qmake, we need moc and the cflags / ldflags. Since > pkg-config worked for us previously, I suggest to use pkg-config again > and just check which of QtGui or Qt5Widgets is available. Here's an attempt using pkg-config. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center --nextPart1970081.WyKkAUefPf Content-Disposition: attachment; filename="0001-Use-pkg-config-to-find-Qt-4-and-5-instead-of-direct-.patch" Content-Transfer-Encoding: 7Bit Content-Type: text/x-patch; charset="UTF-8"; name="0001-Use-pkg-config-to-find-Qt-4-and-5-instead-of-direct-.patch" >From b36464e33f102530abe98e0b5e25dee584f50b59 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 1 Nov 2015 21:12:53 -0600 Subject: [PATCH 1/1] Use pkg-config to find Qt 4 and 5 instead of direct qmake The Qt Project recommendation is that there should always be a "qmake" binary and it should never be renamed. If it's necessary to handle multiple Qt versions, the Qt Project recommends using qtchooser. Unfortunately, some distros do not follow the recommendation, so we would need to check qmake-qt4, qmake-qt5, etc. So, instead, let's try pkg-config. Signed-off-by: Thiago Macieira --- scripts/kconfig/Makefile | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 33c4994..8d0b1ba 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -227,35 +227,24 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile # Qt needs some extra effort... $(obj)/.tmp_qtcheck: @set -e; $(kecho) " CHECK qt"; \ - qtver=`qmake -query QT_VERSION` || { \ + if pkg-config --exists Qt5Core; then \ + cflags="-std=c++11 -fPIC `pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets`"; \ + libs=`pkg-config --libs Qt5Core Qt5Gui Qt5Widgets`; \ + moc=`pkg-config --variable=host_bins Qt5Core`/moc; \ + elif pkg-config --exists QtCore; then \ + cflags=`pkg-config --cflags QtCore QtGui`; \ + libs=`pkg-config --libs QtCore QtGui`; \ + moc=`pkg-config --variable=moc_location QtCore`; \ + else \ echo >&2 "*"; \ - echo >&2 "* qmake failed."; \ + echo >&2 "* Could not find Qt via pkg-config."; \ + echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"; \ echo >&2 "*"; \ exit 1; \ - }; \ - qtlibdir=`qmake -query QT_INSTALL_LIBS`; \ - qthdrdir=`qmake -query QT_INSTALL_HEADERS`; \ - qtbindir=`qmake -query QT_INSTALL_BINS`; \ - cflags="-I$$qthdrdir -I$$qthdrdir/QtCore -I$$qthdrdir/QtGui"; \ - case "$$qtver" in \ - 5.*) \ - cflags="$$cflags -I$$qthdrdir/QtWidgets -std=c++11 -fPIC"; \ - libs="-L$$qtlibdir -lQt5Widgets -lQt5Gui -lQt5Core "; \ - ;; \ - 4.*) \ - libs="-L$$qtlibdir -lQtGui -lQtCore"; \ - ;; \ - *) \ - echo >&2 "*"; \ - echo >&2 "* Found qmake but it is for Qt version $$qtver, which is not supported."; \ - echo >&2 "* Please install either Qt 4.8 or 5.x."; \ - echo >&2 "*"; \ - exit 1; \ - ;; \ - esac; \ + fi; \ echo "KC_QT_CFLAGS=$$cflags" > $@; \ echo "KC_QT_LIBS=$$libs" >> $@; \ - echo "KC_QT_MOC=$$qtbindir/moc" >> $@ + echo "KC_QT_MOC=$$moc" >> $@ endif $(obj)/gconf.o: $(obj)/.tmp_gtkcheck -- 2.6.2 --nextPart1970081.WyKkAUefPf-- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/