From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us194mx009.tycoelectronics.net ([198.175.154.211]) by linuxtogo.org with esmtp (Exim 4.69) (envelope-from ) id 1OeZaz-0008Ie-AN for openembedded-devel@lists.openembedded.org; Thu, 29 Jul 2010 22:20:58 +0200 Received: from [163.241.71.52] (163.241.71.52) by us194mx009.tycoelectronics.net (163.241.185.250) with Microsoft SMTP Server id 8.1.393.1; Thu, 29 Jul 2010 16:20:28 -0400 Message-ID: <4C51E289.6070606@tycoelectronics.com> Date: Thu, 29 Jul 2010 16:20:25 -0400 From: Jay Snyder User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: References: In-Reply-To: X-SA-Exim-Connect-IP: 198.175.154.211 X-SA-Exim-Mail-From: jay.snyder@tycoelectronics.com X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on discovery X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.2.5 X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:20:07 +0000) X-SA-Exim-Scanned: Yes (on linuxtogo.org) Subject: Re: Qt4 recipe fix -- updated X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: openembedded-devel@lists.openembedded.org List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jul 2010 20:20:59 -0000 Content-Type: multipart/mixed; boundary="------------060302080302040608000208" --------------060302080302040608000208 Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit I did a git pull today (my working directory from was 2010-06-23), and have updated the recipe to also update the .inc file for Qt 4.6.3 I have NOT, however, tested my patch with the Beta for Qt 4.7.0 yet, so I did not change the files for that. Regards, Jay --------------060302080302040608000208 Content-Type: text/x-diff; name="Qt4-recipe-compiler-fix.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="Qt4-recipe-compiler-fix.patch" diff -Naur /home/oe/2010-07-29/openembedded/recipes/qt4/files/configure-conf_compiler-fix.patch /home/oe/local/recipes/qt4/files/configure-conf_compiler-fix.patch --- /home/oe/2010-07-29/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-07-29/openembedded/recipes/qt4/qt-4.6.0.inc /home/oe/local/recipes/qt4/qt-4.6.0.inc --- /home/oe/2010-07-29/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-07-29/openembedded/recipes/qt4/qt-4.6.2.inc /home/oe/local/recipes/qt4/qt-4.6.2.inc --- /home/oe/2010-07-29/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-07-29/openembedded/recipes/qt4/qt-4.6.3.inc /home/oe/local/recipes/qt4/qt-4.6.3.inc --- /home/oe/2010-07-29/openembedded/recipes/qt4/qt-4.6.3.inc 2010-07-29 13:49:47.000000000 -0400 +++ /home/oe/local/recipes/qt4/qt-4.6.3.inc 2010-07-29 16:15:45.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-07-29/openembedded/recipes/qt4/qt4-embedded.inc /home/oe/local/recipes/qt4/qt4-embedded.inc --- /home/oe/2010-07-29/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-07-29/openembedded/recipes/qt4/qt4-x11-free.inc /home/oe/local/recipes/qt4/qt4-x11-free.inc --- /home/oe/2010-07-29/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 \ --------------060302080302040608000208--