make xconfig no longer works in Fedora

make xconfig no longer works in Fedora

[Alexey Brodkin]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1993 bytes --]

Hi Thiago,

I noticed that with your patch "Update the buildsystem for KConfig finding Qt"
I cannot use "make xconfig" in Fedora 22 any longer.

That's what I'm seeing:
-------------------->8---------------------
$ make xconfig
  CHECK   qt
/bin/sh: line 1: qmake: command not found
*
* qmake failed.
*
make[1]: *** No rule to make target 'scripts/kconfig/.tmp_qtcheck', needed by 'scripts/kconfig/qconf.o'.  Stop.
Makefile:547: recipe for target 'xconfig' failed
make: *** [xconfig] Error 2
-------------------->8---------------------

The reason why xconfig target fails is in Fedora (at least its recent versions)
there's no "qmake". Instead there're "qmake-qt4" and/or "qmake-qt5" depending on
which Qt packages are installed.

I understand that there're plenty of possible workarounds like creating
an alias qmake -> qmake-qtX, usage of "update-alternatives" etc.

But IMHO it would be really nice if we don't break things that used to work.

Still if I revert the patch in question "make xconfig" works again.
And that's because we did autodiscovery of moc like that:
-------------------->8---------------------
moc="\$$(shell pkg-config QtCore --variable=moc_location)";
-------------------->8---------------------

In my case it returns:
-------------------->8---------------------
$ pkg-config QtCore --variable=moc_location
/usr/lib64/qt4/bin/moc
-------------------->8---------------------

If we do want to use "qmake" directly we may first find it similarly:

-------------------->8---------------------
$ pkg-config QtCore --variable=exec_prefix
/usr/lib64/qt4
-------------------->8---------------------

And then add "/bin/qmake" like this:
-------------------->8---------------------
qmake="\$$(shell pkg-config QtCore --variable=exec_prefix""/bin/qmake";
-------------------->8---------------------

Regards,
Alexeyÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: make xconfig no longer works in Fedora

[Thiago Macieira]

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

On Saturday 31 October 2015 12:39:21 Alexey Brodkin wrote:
> Hi Thiago,
> 
> I noticed that with your patch "Update the buildsystem for KConfig finding
> Qt"
> I cannot use "make xconfig" in Fedora 22 any longer.

Hello Alexey

> The reason why xconfig target fails is in Fedora (at least its recent
> versions)
> there's no "qmake". Instead there're "qmake-qt4" and/or
> "qmake-qt5" depending on which Qt packages are installed.

Hmm... you're right. There's no check for a program with a different name in 
the new Makefile. I apologise, I never tested that case.

Fedora is knowingly deviating from Qt Project recommendations. I will fix 
this, but please file a bug report against their Qt packages so there's some 
pressure to adopt a standard solution that everyone else already does.

> But IMHO it would be really nice if we don't break things that used to
> work.

Right. Can you try the attached patch to see if it solves the problem for you?

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

[-- Attachment #2: 0001-Attempt-to-find-qmake-qt5-and-qmake-qt4-if-no-qmake-.patch --]
[-- Type: text/x-patch, Size: 1280 bytes --]

>From fd7d0a2137ece3294703878fc1667e5196f766b9 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 1 Nov 2015 21:12:53 -0600
Subject: [PATCH 1/1] Attempt to find qmake-qt5 and qmake-qt4 if no "qmake" is
 found in $PATH

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 need
to test different possibilities...

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>
---
 scripts/kconfig/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 33c4994..0511557 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -227,7 +227,9 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
 # Qt needs some extra effort...
 $(obj)/.tmp_qtcheck:
 	@set -e; $(kecho) "  CHECK   qt"; \
-	qtver=`qmake -query QT_VERSION` || { \
+	qtver=`qmake -query QT_VERSION` || \
+	qtver=`qmake-qt5 -query QT_VERSION` || \
+	qtver=`qmake-qt4 -query QT_VERSION` || { \
 	    echo >&2 "*"; \
 	    echo >&2 "* qmake failed."; \
 	    echo >&2 "*"; \
-- 
2.6.2

Re: make xconfig no longer works in Fedora

[Michal Marek]

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.

Michal

Re: make xconfig no longer works in Fedora

[Thiago Macieira]

[-- Attachment #1: Type: text/plain, Size: 789 bytes --]

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

[-- Attachment #2: 0001-Use-pkg-config-to-find-Qt-4-and-5-instead-of-direct-.patch --]
[-- Type: text/x-patch, Size: 2725 bytes --]

>From b36464e33f102530abe98e0b5e25dee584f50b59 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
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 <thiago.macieira@intel.com>
---
 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

Re: make xconfig no longer works in Fedora

[Michal Marek]

On Mon, Nov 02, 2015 at 08:46:55AM -0500, Thiago Macieira wrote:
> 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.

Works for me on openSUSE, it just started to prefer Qt5 now. But it
correctly builds against Qt4 if Qt5 is not available.

Michal

Re: make xconfig no longer works in Fedora

[Thiago Macieira]

On Monday 02 November 2015 16:50:33 Michal Marek wrote:
> On Mon, Nov 02, 2015 at 08:46:55AM -0500, Thiago Macieira wrote:
> > 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.
> 
> Works for me on openSUSE, it just started to prefer Qt5 now. But it
> correctly builds against Qt4 if Qt5 is not available.

That's a consequence of using pkg-config. Now you can no longer choose your 
preferred Qt version by setting QT_SELECT, like the qmake solution would have 
allowed, as recommended by the Qt Project. At least, the qtchooser shell 
function extension does set PKG_CONFIG_PATH, so if you  install a different 
version elsewhere, that version should be picked up.

It would have been the same with CMake too, btw.

Alexey, did this solve the problem for you?
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

Re: make xconfig no longer works in Fedora

[Michal Marek]

On 2015-11-02 17:01, Thiago Macieira wrote:
> On Monday 02 November 2015 16:50:33 Michal Marek wrote:
>> On Mon, Nov 02, 2015 at 08:46:55AM -0500, Thiago Macieira wrote:
>>> 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.
>>
>> Works for me on openSUSE, it just started to prefer Qt5 now. But it
>> correctly builds against Qt4 if Qt5 is not available.
> 
> That's a consequence of using pkg-config. Now you can no longer choose your 
> preferred Qt version by setting QT_SELECT, like the qmake solution would have 
> allowed, as recommended by the Qt Project.

Yeah, but I think this is acceptable for an application like qconf. Use
best effort to build against some Qt version to let the user configure
their kernel.

Michal

Re: make xconfig no longer works in Fedora

[Alexey Brodkin]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 1790 bytes --]

Hi Thiago,

On Mon, 2015-11-02 at 11:01 -0500, Thiago Macieira wrote:
> On Monday 02 November 2015 16:50:33 Michal Marek wrote:
> > On Mon, Nov 02, 2015 at 08:46:55AM -0500, Thiago Macieira wrote:
> > > 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.
> > 
> > Works for me on openSUSE, it just started to prefer Qt5 now. But it
> > correctly builds against Qt4 if Qt5 is not available.
> 
> That's a consequence of using pkg-config. Now you can no longer choose your 
> preferred Qt version by setting QT_SELECT, like the qmake solution would have 
> allowed, as recommended by the Qt Project. At least, the qtchooser shell 
> function extension does set PKG_CONFIG_PATH, so if you  install a different 
> version elsewhere, that version should be picked up.
> 
> It would have been the same with CMake too, btw.
> 
> Alexey, did this solve the problem for you?

Yep, thanks a lot.
"make xconfig" now works for me!

-Alexeyÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: make xconfig no longer works in Fedora

[Michal Marek]

Dne 2.11.2015 v 17:28 Alexey Brodkin napsal(a):
> On Mon, 2015-11-02 at 11:01 -0500, Thiago Macieira wrote:
>> Alexey, did this solve the problem for you?
> 
> Yep, thanks a lot.
> "make xconfig" now works for me!

Thanks for testing, I will apply it to kbuild.git#kconfig.

Thanks,
Michal

Re: make xconfig no longer works in Fedora

[Alexey Brodkin]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 622 bytes --]

Hi Michal,

On Mon, 2015-11-02 at 21:38 +0100, Michal Marek wrote:
> Dne 2.11.2015 v 17:28 Alexey Brodkin napsal(a):
> > On Mon, 2015-11-02 at 11:01 -0500, Thiago Macieira wrote:
> > > Alexey, did this solve the problem for you?
> > 
> > Yep, thanks a lot.
> > "make xconfig" now works for me!
> 
> Thanks for testing, I will apply it to kbuild.git#kconfig.

Thank you for doing this.

Feel free to add "Acked-by: Alexey Brodkin <abrodkin@synopsys.com>"

-Alexeyÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥