Re: Qt4 recipe fix; fixes configure so compiler is, detected, properly, and QXMLPatterns gets built

Re: Qt4 recipe fix; fixes configure so compiler is, detected, properly, and QXMLPatterns gets built

[Jay Snyder]

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

Patch produced with 'diff -Naur', as per Henning Heinold's request:


[-- Attachment #2: Qt4-recipe-compiler-fix.patch --]
[-- Type: text/x-diff, Size: 3570 bytes --]

diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/files/configure-conf_compiler-fix.patch /home/oe/local/recipes/qt4/files/configure-conf_compiler-fix.patch
--- /home/oe/2010-06-23/openembedded/recipes/qt4/files/configure-conf_compiler-fix.patch	1969-12-31 19:00:00.000000000 -0500
+++ /home/oe/local/recipes/qt4/files/configure-conf_compiler-fix.patch	2010-07-28 09:42:06.000000000 -0400
@@ -0,0 +1,12 @@
+Index qt-everywhere-opensource-src-4.6.0.orig/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.6.0/configure.orig	2009-12-10 15:49:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.6.0/configure	2009-12-10 15:50:20.000000000 -0500
+@@ -2917,6 +2917,7 @@
+ fi
+ 
+ QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
++eval QMAKE_CONF_COMPILER=$(echo $QMAKE_CONF_COMPILER | sed "s/(/{/" | sed "s/)/}/")
+ TEST_COMPILER="$CC"
+ [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
+ 
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt-4.6.0.inc /home/oe/local/recipes/qt4/qt-4.6.0.inc
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt-4.6.0.inc	2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt-4.6.0.inc	2010-07-28 09:43:19.000000000 -0400
@@ -3,6 +3,7 @@
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0004-no-qmake.patch \
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt-4.6.2.inc /home/oe/local/recipes/qt4/qt-4.6.2.inc
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt-4.6.2.inc	2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt-4.6.2.inc	2010-07-28 09:43:16.000000000 -0400
@@ -3,6 +3,7 @@
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0004-no-qmake.patch \
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-embedded.inc /home/oe/local/recipes/qt4/qt4-embedded.inc
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-embedded.inc	2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt4-embedded.inc	2010-07-28 09:43:31.000000000 -0400
@@ -12,6 +12,7 @@
 QT_LIBINFIX = "E"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0003-no-tools.patch \
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-x11-free.inc /home/oe/local/recipes/qt4/qt4-x11-free.inc
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-x11-free.inc	2010-06-29 16:11:40.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt4-x11-free.inc	2010-07-28 09:44:02.000000000 -0400
@@ -8,6 +8,7 @@
 INC_PR = "r18"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0003-no-tools.patch \

Re: Qt4 recipe fix; fixes configure so compiler is, detected, properly, and QXMLPatterns gets built

[Henning Heinold]

Hi,

because you are touching .inc files you need to increment the INC_PR number of the inc files.

Bye Henning

Re: Qt4 recipe fix; fixes configure so compiler is,, detected, properly, and QXMLPatterns gets built

[Jay Snyder]

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

I have updated the patch to include incrementing the INC_PR numbers in 
.inc files.    Please see attached (or the URL below).

http://home.comcast.net/~jay.snyder/Qt4-recipe-compiler-fix/Qt4-recipe-compiler-fix.patch


Regards,
Jay


[-- Attachment #2: Qt4-recipe-compiler-fix.patch --]
[-- Type: text/x-diff, Size: 7490 bytes --]

diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/files/configure-conf_compiler-fix.patch /home/oe/local/recipes/qt4/files/configure-conf_compiler-fix.patch
--- /home/oe/2010-06-23/openembedded/recipes/qt4/files/configure-conf_compiler-fix.patch	1969-12-31 19:00:00.000000000 -0500
+++ /home/oe/local/recipes/qt4/files/configure-conf_compiler-fix.patch	2010-07-28 09:42:06.000000000 -0400
@@ -0,0 +1,12 @@
+Index qt-everywhere-opensource-src-4.6.0.orig/configure
+===================================================================
+--- qt-everywhere-opensource-src-4.6.0/configure.orig	2009-12-10 15:49:49.000000000 -0500
++++ qt-everywhere-opensource-src-4.6.0/configure	2009-12-10 15:50:20.000000000 -0500
+@@ -2917,6 +2917,7 @@
+ fi
+ 
+ QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
++eval QMAKE_CONF_COMPILER=$(echo $QMAKE_CONF_COMPILER | sed "s/(/{/" | sed "s/)/}/")
+ TEST_COMPILER="$CC"
+ [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
+ 
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt-4.6.0.inc /home/oe/local/recipes/qt4/qt-4.6.0.inc
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt-4.6.0.inc	2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt-4.6.0.inc	2010-07-28 09:43:19.000000000 -0400
@@ -3,6 +3,7 @@
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0004-no-qmake.patch \
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt-4.6.2.inc /home/oe/local/recipes/qt4/qt-4.6.2.inc
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt-4.6.2.inc	2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt-4.6.2.inc	2010-07-28 09:43:16.000000000 -0400
@@ -3,6 +3,7 @@
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0004-no-qmake.patch \
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-embedded.inc /home/oe/local/recipes/qt4/qt4-embedded.inc
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-embedded.inc	2010-06-23 16:50:01.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt4-embedded.inc	2010-07-29 08:23:23.000000000 -0400
@@ -4,7 +4,7 @@
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r20"
+INC_PR = "r21"
 
 QT_BASE_NAME ?= "qt4-embedded"
 QT_BASE_LIB  ?= "libqt-embedded"
@@ -12,6 +12,7 @@
 QT_LIBINFIX = "E"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0003-no-tools.patch \
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-embedded.inc.~1~ /home/oe/local/recipes/qt4/qt4-embedded.inc.~1~
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-embedded.inc.~1~	1969-12-31 19:00:00.000000000 -0500
+++ /home/oe/local/recipes/qt4/qt4-embedded.inc.~1~	2010-07-28 09:43:31.000000000 -0400
@@ -0,0 +1,52 @@
+SUMMARY = "Qt is a versatile cross-platform application framework -- this is the embedded version."
+SECTION = "libs"
+LICENSE = "GPL QPL"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+DEPENDS += "directfb tslib"
+INC_PR = "r20"
+
+QT_BASE_NAME ?= "qt4-embedded"
+QT_BASE_LIB  ?= "libqt-embedded"
+QT_DIR_NAME = "qtopia"
+QT_LIBINFIX = "E"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+	   file://configure-conf_compiler-fix.patch \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0003-no-tools.patch \
+           file://0004-no-qmake.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0007-openssl-host-includes.patch \
+           file://0008-qt-lib-infix.patch \
+           file://0009-support-2bpp.patch \
+           file://fix-config-tests.patch \
+           file://g++.conf \
+           file://linux.conf \
+           "
+
+# Set necessary variables in the profile
+SRC_URI += "file://qte.sh"
+
+S = "${WORKDIR}/qt-embedded-linux-opensource-src-${PV}"
+
+QT_CONFIG_FLAGS += " \
+    -qtlibinfix ${QT_LIBINFIX} \
+    -plugin-gfx-transformed -plugin-gfx-qvfb -plugin-gfx-vnc -plugin-gfx-directfb \
+    -plugin-mouse-tslib -qt-mouse-pc -qt-mouse-qvfb -qt-mouse-linuxinput \
+    -qt-kbd-tty \
+    -DQT_KEYPAD_NAVIGATION \
+    "
+
+require qt4.inc
+
+do_install_append() {
+	install -d ${D}${sysconfdir}/profile.d/
+	install -m 0755 ${WORKDIR}/qte.sh ${D}${sysconfdir}/profile.d/
+}
+
+FILES_qt4-embedded += " ${sysconfdir}/profile.d/qte.sh"
+
+inherit qt4e
+
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-x11-free.inc /home/oe/local/recipes/qt4/qt4-x11-free.inc
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-x11-free.inc	2010-06-29 16:11:40.000000000 -0400
+++ /home/oe/local/recipes/qt4/qt4-x11-free.inc	2010-07-29 08:23:19.000000000 -0400
@@ -5,9 +5,10 @@
 LICENSE = "GPL QPL"
 DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r18"
+INC_PR = "r19"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0003-no-tools.patch \
diff -Naur /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-x11-free.inc.~1~ /home/oe/local/recipes/qt4/qt4-x11-free.inc.~1~
--- /home/oe/2010-06-23/openembedded/recipes/qt4/qt4-x11-free.inc.~1~	1969-12-31 19:00:00.000000000 -0500
+++ /home/oe/local/recipes/qt4/qt4-x11-free.inc.~1~	2010-07-28 09:44:02.000000000 -0400
@@ -0,0 +1,35 @@
+DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is the X11 version."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "GPL QPL"
+DEPENDS += "virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
+
+INC_PR = "r18"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
+           file://0001-cross-compile.patch \
+           file://0002-fix-resinit-declaration.patch \
+           file://0003-no-tools.patch \
+           file://0004-no-qmake.patch \
+           file://0006-freetype-host-includes.patch \
+           file://0007-openssl-host-includes.patch \ 
+           file://0008-qt-lib-infix.patch \
+           file://fix-config-tests.patch \
+           file://g++.conf \
+           file://linux.conf \
+           "
+S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
+
+QT_GLFLAGS ?= "-no-opengl"
+QT_CONFIG_FLAGS += "-no-xinerama -no-xkb ${QT_GLFLAGS}"
+QT_BASE_NAME ?= "qt4"
+QT_BASE_LIB  ?= "libqt"
+QT_DIR_NAME = "qt4"
+QT_LIBINFIX = ""
+
+require qt4.inc
+
+inherit qt4x11
+

Re: Qt4 recipe fix; fixes configure so compiler is, detected properly, and QXMLPatterns gets built

[Jay Snyder]

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

>
>
> this patch removes the patch you want to add. Is that correct? Could 
> you add
> the "More Info" to the top of the patch as well? Could you also 
> include the
> failure you are seeing?
>
I have fixed the patch (common error, had reversed the order of 
arguments to diff).
http://home.comcast.net/~jay.snyder/Qt4-recipe-compiler-fix/Qt4-recipe-compiler-fix.patch

Please see attachments.

Another user requested using git-diff.     My changes are in an overlay 
directory, so git-diff will not work.    How do I get a git-format diff 
from the normal diff program?


Also, you ask to "include the failure you are seeing", here it is (from 
log.do_configure.*):

./configure: line 6406: $(OE_QMAKE_CXX): command not found


The configure script needs to use the contents of the ${OE_QMAKE_CXX}  
variable, but is instead trying to use $(OE_QMAKE_CXX), because that is 
what QMAKE_CXX is set to in the .pro file, and in the resultant Makefile.

The above failure results in compiler features not being tested, and 
ultimately QtXmlPatterns doesn't get turned on (I don't know what other 
features might get disabled, but this is one that I needed).

Regards,
Jay




[-- Attachment #2: Qt4-recipe-compiler-fix.patch --]
[-- Type: text/x-diff, Size: 1985 bytes --]

--- 2010-06-23/openembedded/recipes/qt4/qt-4.6.0.inc	2010-06-23 16:50:01.000000000 -0400
+++ local/recipes/qt4/qt-4.6.0.inc	2010-07-28 09:43:19.000000000 -0400
@@ -3,6 +3,7 @@
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0004-no-qmake.patch \
--- 2010-06-23/openembedded/recipes/qt4/qt-4.6.2.inc	2010-06-23 16:50:01.000000000 -0400
+++ local/recipes/qt4/qt-4.6.2.inc	2010-07-28 09:43:16.000000000 -0400
@@ -3,6 +3,7 @@
 FILESPATHPKG .= ":qt-${PV}"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0004-no-qmake.patch \
--- 2010-06-23/openembedded/recipes/qt4/qt4-embedded.inc	2010-06-23 16:50:01.000000000 -0400
+++ local/recipes/qt4/qt4-embedded.inc	2010-07-28 09:43:31.000000000 -0400
@@ -12,6 +12,7 @@
 QT_LIBINFIX = "E"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0003-no-tools.patch \
--- 2010-06-23/openembedded/recipes/qt4/qt4-x11-free.inc	2010-06-29 16:11:40.000000000 -0400
+++ local/recipes/qt4/qt4-x11-free.inc	2010-07-28 09:44:02.000000000 -0400
@@ -8,6 +8,7 @@
 INC_PR = "r18"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
+	   file://configure-conf_compiler-fix.patch \
            file://0001-cross-compile.patch \
            file://0002-fix-resinit-declaration.patch \
            file://0003-no-tools.patch \

[-- Attachment #3: configure-conf_compiler-fix.patch --]
[-- Type: text/x-diff, Size: 629 bytes --]

Index qt-everywhere-opensource-src-4.6.0.orig/configure
===================================================================
--- qt-everywhere-opensource-src-4.6.0/configure.orig	2009-12-10 15:49:49.000000000 -0500
+++ qt-everywhere-opensource-src-4.6.0/configure	2009-12-10 15:50:20.000000000 -0500
@@ -2917,6 +2917,7 @@
 fi
 
 QMAKE_CONF_COMPILER=`getQMakeConf "$XQMAKESPEC" | grep "^QMAKE_CXX[^_A-Z0-9]" | sed "s,.* *= *\(.*\)$,\1," | tail -1`
+eval QMAKE_CONF_COMPILER=$(echo $QMAKE_CONF_COMPILER | sed "s/(/{/" | sed "s/)/}/")
 TEST_COMPILER="$CC"
 [ -z "$TEST_COMPILER" ] && TEST_COMPILER=$QMAKE_CONF_COMPILER
 

Qt4 recipe fix; fixes configure so compiler is detected properly, and QXMLPatterns gets built

[Jay Snyder]

Please see this link for two files, a patch for the recipe, and also a 
new file:
http://home.comcast.net/~jay.snyder/Qt4-recipe-compiler-fix

http://home.comcast.net/~jay.snyder/Qt4-recipe-compiler-fix/configure-conf_compiler-fix.patch
patch file to go into the files/ directory of the recipe -- this file 
patches the configure program so that the tests of compiler capability 
work properly in OE

http://home.comcast.net/~jay.snyder/Qt4-recipe-compiler-fix/Qt4-recipe-compiler-fix.patch
patches to the various .inc and .bb files to include 
configure-conf_compiler-fix.patch in the list of patches used

More info:
The code the configure script which sets TEST_COMPILER uses the 
QMAKE_CONF_COMPILER variable from the Makefile to determine which 
compiler is being used.     This code  gets messed up by the use of the 
$(VARIABLE) construct used in a Makefile and doesn't set the compiler 
correctly.    I added a line which converts this to ${VARIABLE} to 
evaluate it, so that the correct value is extracted from the environment.

This was not preventing Qt4 from building, but was breaking some tests 
which are used to determine which features of Qt4 to enable and disable, 
one of which is the QtXmlPatterns library, which the application I am 
running on an OE system requires.

Please add these changes to the Qt4 recipe.

Regards,
Jay Snyder

Re: Qt4 recipe fix; fixes configure so compiler is detected properly, and QXMLPatterns gets built

[Holger Freyther]

On 07/28/2010 11:25 PM, Jay Snyder wrote:
> Please see this link for two files, a patch for the recipe, and also a new file:

> 
> http://home.comcast.net/~jay.snyder/Qt4-recipe-compiler-fix/Qt4-recipe-compiler-fix.patch

this patch removes the patch you want to add. Is that correct? Could you add
the "More Info" to the top of the patch as well? Could you also include the
failure you are seeing?

thanks

Re: Qt4 recipe fix; fixes configure so compiler is detected properly, and QXMLPatterns gets built

[Henning Heinold]

Hi,

I would really kind of you to use "git diff" and attach the resulting patch here.
Or use git format-patch and git send-email.

Bye Henning