From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1S1mY4-0004OK-86 for openembedded-devel@lists.openembedded.org; Sun, 26 Feb 2012 23:26:32 +0100 Received: from azsmga002.ch.intel.com ([10.2.17.35]) by azsmga101.ch.intel.com with ESMTP; 26 Feb 2012 14:18:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="70494803" Received: from unknown (HELO helios.ger.corp.intel.com) ([10.252.123.61]) by AZSMGA002.ch.intel.com with ESMTP; 26 Feb 2012 14:18:05 -0800 From: Paul Eggleton To: openembedded-devel@lists.openembedded.org Date: Sun, 26 Feb 2012 22:17:58 +0000 Message-Id: X-Mailer: git-send-email 1.7.5.4 In-Reply-To: References: In-Reply-To: References: Subject: [PATCH 1/4] qt4: fix compile error in Qt 4.8.0 with gcc 4.6 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: Sun, 26 Feb 2012 22:26:32 -0000 Ensure the Qt configure script can can detect the compiler correctly as g++. This fixes the following compile error with gcc 4.6: ./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat] Signed-off-by: Paul Eggleton --- meta/recipes-qt/qt4/qt-4.8.0.inc | 1 + .../qt4/qt-4.8.0/configure_oe_compiler.patch | 31 ++++++++++++++++++++ meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb | 2 +- 3 files changed, 33 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc index 2addbb2..532f1ff 100644 --- a/meta/recipes-qt/qt4/qt-4.8.0.inc +++ b/meta/recipes-qt/qt4/qt-4.8.0.inc @@ -14,6 +14,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. file://fix-translations.patch \ file://add_nostrip_for_debug_packages.diff \ file://qmake_cxx_eval.patch \ + file://configure_oe_compiler.patch \ file://g++.conf \ file://linux.conf \ " diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch new file mode 100644 index 0000000..d455d0a --- /dev/null +++ b/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch @@ -0,0 +1,31 @@ +Ensure we identify the compiler as g++ in configure + +Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure +script was interpreting from this that the compiler was "oe-g++" and thus +g++ specific checks were not being run since this string did not match; +among other things this resulted in a compiler version check in the +QtWebKit build code not working, and hence the following error at build +time: + +./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat] + +The easiest thing since our PLATFORM is entirely artificial is to just +force COMPILER to "g++" in the configure script if it is detected as +"oe-g++". + +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Paul Eggleton + +--- qt-everywhere-opensource-src-4.8.0.orig/configure ++++ qt-everywhere-opensource-src-4.8.0/configure +@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; th + else + COMPILER=`echo $PLATFORM | cut -f 2- -d-` + fi ++case $COMPILER in ++ *oe-g++) COMPILER="g++" ;; ++esac + if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then + CFG_EXCEPTIONS=no + fi diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb index 5c1c97e..efbc02a 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb @@ -1,7 +1,7 @@ require qt-${PV}.inc require qt4-embedded.inc -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" -- 1.7.5.4