Patchwork [meta-opie,1/6] uicmoc: do also provide nativesdk variant

login
register
mail settings
Submitter lumag
Date Dec. 13, 2011, 4:44 p.m.
Message ID <1323794683-24233-2-git-send-email-dbaryshkov@gmail.com>
Download mbox | patch
Permalink /patch/16843/
State Accepted
Headers show

Comments

lumag - Dec. 13, 2011, 4:44 p.m.
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>
---
 .../64bit-cleanup.patch                            |    0
 .../fix-makefile.patch                             |    0
 .../gcc3_4.patch                                   |    0
 .../gcc4.patch                                     |    0
 .../gcc4_1.patch                                   |    0
 .../kernel-asm-page.patch                          |    0
 .../{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb}  |   11 ++++++++---
 7 files changed, 8 insertions(+), 3 deletions(-)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/64bit-cleanup.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/fix-makefile.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc3_4.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc4.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/gcc4_1.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native-2.3.10 => uicmoc-2.3.10}/kernel-asm-page.patch (100%)
 rename recipes-qt/uicmoc/{uicmoc-native_2.3.10.bb => uicmoc_2.3.10.bb} (81%)

Patch

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
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/64bit-cleanup.patch
rename to 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
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/fix-makefile.patch
rename to 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
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc3_4.patch
rename to 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
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4.patch
rename to 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
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/gcc4_1.patch
rename to 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
similarity index 100%
rename from recipes-qt/uicmoc/uicmoc-native-2.3.10/kernel-asm-page.patch
rename to 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
similarity index 81%
rename from recipes-qt/uicmoc/uicmoc-native_2.3.10.bb
rename to 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 \