aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-12-13 20:23:59 +0400
committerDmitry Eremin-Solenikov <dbaryshkov@gmail.com>2011-12-13 20:23:59 +0400
commit1b9a1e67b3311f95c7cd4c21e630372c8f444838 (patch)
tree27e3737db73843af3d5bc9702b451462c937f9fb
parentad8e8dc745831e2f8523757d790294906500b0ad (diff)
downloadmeta-opie-1b9a1e67b3311f95c7cd4c21e630372c8f444838.tar.gz
meta-opie-1b9a1e67b3311f95c7cd4c21e630372c8f444838.tar.bz2
meta-opie-1b9a1e67b3311f95c7cd4c21e630372c8f444838.zip
uicmoc: do also provide nativesdk variant
Opie SDK needs nativesdk version of uicmoc package. To achieve this, replace uicmoc-native with uicmoc recipe, which can be built both as virtclass-native and virtclass-nativesdk. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
-rw-r--r--recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch (renamed from recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch)0
-rw-r--r--recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch (renamed from recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch)0
-rw-r--r--recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch (renamed from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch)0
-rw-r--r--recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch (renamed from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch)0
-rw-r--r--recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch (renamed from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch)0
-rw-r--r--recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch (renamed from recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch)0
-rw-r--r--recipes-qt/uicmoc/uicmoc_2.3.10.bb (renamed from recipes-qt/uicmoc/uicmoc-native_2.3.10.bb)11
7 files changed, 8 insertions, 3 deletions
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch
index 3cca3e0..3cca3e0 100644
--- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch
+++ b/recipes-qt/uicmoc/uicmoc-2.3.10/64bit-cleanup.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch
index 5943f0f..5943f0f 100644
--- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch
+++ b/recipes-qt/uicmoc/uicmoc-2.3.10/fix-makefile.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch
index fc1656a..fc1656a 100644
--- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch
+++ b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc3_4.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch
index 633fe86..633fe86 100644
--- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch
+++ b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch
index 550effd..550effd 100644
--- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch
+++ b/recipes-qt/uicmoc/uicmoc-2.3.10/gcc4_1.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch b/recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch
index 0d31874..0d31874 100644
--- a/recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
+++ b/recipes-qt/uicmoc/uicmoc-2.3.10/kernel-asm-page.patch
diff --git a/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb b/recipes-qt/uicmoc/uicmoc_2.3.10.bb
index 57f61d4..e72a454 100644
--- a/recipes-qt/uicmoc/uicmoc-native_2.3.10.bb
+++ b/recipes-qt/uicmoc/uicmoc_2.3.10.bb
@@ -16,11 +16,16 @@ S = "${WORKDIR}/qt-${PV}"
LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=aea7d119b7f7d798464fa2b1aae005f8 \
file://README;beginline=1;endline=7;md5=d3e237af71522cc2a3c89dbaf48b345d"
-inherit native qmake_base
+inherit qmake_base
+BBCLASSEXTEND = "native nativesdk"
+UICMOCNATIVE = "uicmoc-native"
+UICMOCNATIVE_virtclass-native = ""
+DEPENDS_prepend = "${UICMOCNATIVE}"
export QTDIR = "${S}"
-EXTRA_OEMAKE = 'SYSCONF_CXX="${CXX}" SYSCONF_LINK="${CXX}"'
-CXXFLAGS += " -DQWS"
+SYSUICMOC = 'SYSCONF_MOC="${STAGING_BINDIR_NATIVE}/moc2" SYSCONF_UIC="${STAGING_BINDIR_NATIVE}/uic2"'
+SYSUICMOC_virtclass-native = ""
+EXTRA_OEMAKE = 'SYSCONF_CC="${CC}" SYSCONF_CXX="${CXX}" SYSCONF_CFLAGS="${CFLAGS}" SYSCONF_CXXFLAGS="${CXXFLAGS} -DQWS" SYSCONF_LINK="${CXX}" ${SYSUICMOC}'
QT_CONFIG_FLAGS = "-depths 8,16 -no-qvfb -no-g++-exceptions -no-jpeg -no-mng \
-qt-zlib -qt-libpng -no-xft -no-xkb -no-vnc -no-sm \