Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: Jay Snyder <jay.snyder@tycoelectronics.com>
To: <openembedded-devel@lists.openembedded.org>
Subject: Re: Qt4 recipe fix; fixes configure so compiler is, detected, properly, and QXMLPatterns gets built
Date: Wed, 28 Jul 2010 15:56:50 -0400	[thread overview]
Message-ID: <4C508B82.5060005@tycoelectronics.com> (raw)
In-Reply-To: <mailman.147.1280337399.17151.openembedded-devel@lists.openembedded.org>

[-- 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 \

       reply	other threads:[~2010-07-28 19:57 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <mailman.147.1280337399.17151.openembedded-devel@lists.openembedded.org>
2010-07-28 19:56 ` Jay Snyder [this message]
2010-07-28 20:08   ` Qt4 recipe fix; fixes configure so compiler is, detected, properly, and QXMLPatterns gets built Henning Heinold
     [not found] <mailman.157.1280347758.17151.openembedded-devel@lists.openembedded.org>
2010-07-29 12:32 ` Qt4 recipe fix; fixes configure so compiler is,, " Jay Snyder
     [not found] <mailman.142.1280333371.17151.openembedded-devel@lists.openembedded.org>
2010-07-28 16:34 ` Qt4 recipe fix; fixes configure so compiler is, detected " Jay Snyder
     [not found] <mailman.126.1280326040.17151.openembedded-devel@lists.openembedded.org>
2010-07-28 15:25 ` Qt4 recipe fix; fixes configure so compiler is " Jay Snyder
2010-07-28 16:03   ` Holger Freyther
2010-07-28 16:07   ` Henning Heinold

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4C508B82.5060005@tycoelectronics.com \
    --to=jay.snyder@tycoelectronics.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox