From 48ee17af942ac9860e834c8dec049370e7802a56 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 28 May 2015 14:58:06 +0200 Subject: qt5: merge .inc and _git.bb files Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtscript_git.bb | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'recipes-qt/qt5/qtscript_git.bb') diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb index 4b99e381..489be2e6 100644 --- a/recipes-qt/qt5/qtscript_git.bb +++ b/recipes-qt/qt5/qtscript_git.bb @@ -1,4 +1,28 @@ +require qt5.inc require qt5-git.inc -require ${PN}.inc + +# There are no LGPLv3-only licensed files in this component. +# Note that some files are LGPL-2.1 only without Digia-Qt-LGPL-Exception-1.1. +LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)" +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv21;md5=cff17b12416c896e10ae2c17a64252e7 \ + file://LICENSE.LGPLv3;md5=c1939be5579666be947371bc8120425f \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \ +" + +# qemuarm build fails with: +# /OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h: In member function 'void QTJSC::AssemblerBuffer::putInt64Unchecked(int64_t)': +#/OE/build/oe-core/tmp-glibc/work/armv5te-oe-linux-gnueabi/qtscript/5.4.1+gitAUTOINC+822df36f25-r0/git/src/3rdparty/javascriptcore/JavaScriptCore/assembler/AssemblerBuffer.h:106:58: warning: cast from 'char*' to 'int64_t* {aka long long int*}' increases required alignment of target type [-Wcast-align] +# *reinterpret_cast(&m_buffer[m_size]) = value; +# ^ +#{standard input}: Assembler messages: +#{standard input}:22: Error: selected processor does not support Thumb mode `stmdb sp!,{r1-r3}' +#{standard input}:23: Error: selected processor does not support Thumb mode `stmdb sp!,{r4-r8,lr}' +#{standard input}:30: Error: lo register required -- `ldmia sp!,{r4-r8,lr}' +#{standard input}:43: Error: lo register required -- `ldmia sp!,{r4-r8,lr}' +ARM_INSTRUCTION_SET = "arm" + +DEPENDS += "qtbase" SRCREV = "822df36f252c5a16cdf82f5666f36e7011df46c4" -- cgit v1.2.3