[oe-commits] org.oe.dev packages/qt4: Move the staging bits from qtopia-core to qt_staging.inc, use it in Qt4/X11
freyther commit
openembedded-commits at lists.openembedded.org
Wed Dec 26 12:17:08 UTC 2007
packages/qt4: Move the staging bits from qtopia-core to qt_staging.inc, use it in Qt4/X11
The qt4-x11-free_4.3.3 and qtopia-core_4.3.3 bbfiles are rather empty now. The next
stop is to make it compile.
Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: f03475e57bbec2218b2417026ea908a9bbb569fc
ViewMTN: http://monotone.openembedded.org/revision/info/f03475e57bbec2218b2417026ea908a9bbb569fc
Files:
1
packages/qt4/qt_staging.inc
packages/qt4/qt4-x11-free.inc
packages/qt4/qt4-x11-free_4.3.3.bb
packages/qt4/qt_packaging.inc
packages/qt4/qtopia-core.inc
packages/qt4/qtopia-core_4.3.3.bb
Diffs:
#
# mt diff -rc48f617b6cde8ea25868d05e091570f0ce5218bd -rf03475e57bbec2218b2417026ea908a9bbb569fc
#
#
#
# add_file "packages/qt4/qt_staging.inc"
# content [29e47cc09119f562a481e833d78686b7dbe5ae42]
#
# patch "packages/qt4/qt4-x11-free.inc"
# from [c50e892238624fd351a31e9c766f9318663621fc]
# to [b4abf4ba10d86e2654cb188e4f365b92e564e98d]
#
# patch "packages/qt4/qt4-x11-free_4.3.3.bb"
# from [1b9ee1d15bc6a358c4697210a08c117eb527619e]
# to [cc8872a380445d2c8344bc46ac50b6ba36513594]
#
# patch "packages/qt4/qt_packaging.inc"
# from [18b270dda2139ab49d6215c82bbee98a233c2e4c]
# to [b5f063e7acbd8425fd911a5c5e4227c5ac7667c0]
#
# patch "packages/qt4/qtopia-core.inc"
# from [0d29e4bbc489c30c90ac8e4dd65db22a8b35d162]
# to [baffc460b4ec1f7a4c2fbbbcdc3ad5ae77b4f5ce]
#
# patch "packages/qt4/qtopia-core_4.3.3.bb"
# from [a8b51c0290334a4ffcc351751b0391c9f4952502]
# to [d4c7ad00be94df45470607e15d0af953b69f996b]
#
============================================================
--- packages/qt4/qt_staging.inc 29e47cc09119f562a481e833d78686b7dbe5ae42
+++ packages/qt4/qt_staging.inc 29e47cc09119f562a481e833d78686b7dbe5ae42
@@ -0,0 +1,25 @@
+# Fixing up some Qt .pc files
+do_stage_append() {
+ cd ${STAGING_LIBDIR}/pkgconfig
+ sed -i s#"-L${S}/lib"##g Qt*.pc
+ sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
+ sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
+}
+
+STAGE_TEMP = "${WORKDIR}/temp-staging"
+do_stage() {
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
+
+ install -d ${STAGING_INCDIR}/${QT_DIR_NAME}
+ install -d ${STAGING_LIBDIR}/${QT_DIR_NAME}
+ cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/${QT_DIR_NAME}/
+
+ for i in ${STAGE_TEMP}/${libdir}/*.la
+ do
+ oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4
+ done
+
+ rm -rf ${STAGE_TEMP}
+}
============================================================
--- packages/qt4/qt4-x11-free.inc c50e892238624fd351a31e9c766f9318663621fc
+++ packages/qt4/qt4-x11-free.inc b4abf4ba10d86e2654cb188e4f365b92e564e98d
@@ -22,5 +22,6 @@ require qt_packaging.inc
QT_DIR_NAME = "qt4"
require qt_depends.inc
require qt_packaging.inc
+require qt_staging.inc
inherit qt4x11
============================================================
--- packages/qt4/qt4-x11-free_4.3.3.bb 1b9ee1d15bc6a358c4697210a08c117eb527619e
+++ packages/qt4/qt4-x11-free_4.3.3.bb cc8872a380445d2c8344bc46ac50b6ba36513594
@@ -1,61 +1,4 @@
-STAGING_QT_DIR = "${STAGING_DIR}/${TARGET_SYS}/qt4"
-
-
-
-# FIXME:
-# * add missing options
-QT_CONFIG_FLAGS += "-no-xinerama -no-tablet -no-xkb -no-opengl"
-
-
-PARTS = "3Support AssistantClient Core DBus Designer DesignerComponents Gui Network Script Sql Svg Test Xml"
-
-do_stage() {
- oe_runmake install INSTALL_ROOT=/
- install -d ${STAGING_QT_DIR}
- install -m 0755 ${STAGING_BINDIR_NATIVE}/rcc4 ${STAGING_QT_DIR}/bin/rcc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/moc4 ${STAGING_QT_DIR}/bin/moc
- install -m 0755 ${STAGING_BINDIR_NATIVE}/uic4 ${STAGING_QT_DIR}/bin/uic
- sed -i -e 's,^QMAKE_RPATHDIR.*,QMAKE_RPATHDIR=${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/mkspecs/qconfig.pri
- for pcc in AssistantClient DBus Test UiTools ; do
- sed -i -e 's,${S}/lib,${STAGING_QT_DIR}/lib,g' ${STAGING_QT_DIR}/lib/pkgconfig/Qt${pcc}.pc
- done
- install -d ${PKG_CONFIG_DIR}/
- for pc in ${STAGING_QT_DIR}/lib/pkgconfig/*.pc ; do
- sed -i -e 's,$(OE_QMAKE_LIBS_X11),-lX11 -lXext,g' $pc
- install -m 0644 $pc ${PKG_CONFIG_DIR}/
- done
-}
-
-# FIXME: Might want to call oe_runmake install INSTALL_ROOT=${D}/${prefix} as well...
-# FIXME: Might want to install everything into ${libdir}/qt4/* to match the usual packing...
-do_install() {
- install -d ${D}${libdir}
- install -d ${D}${bindir}
- install -d ${D}${includedir}
- for part in ${PARTS}
- do
- oe_libinstall -so -C lib libQt$part ${D}${libdir}
- done
- oe_libinstall -a -C lib libQtUiTools ${D}${libdir}
- cp -pPR include/* ${D}${includedir}
- cp -pPR plugins ${D}${libdir}
- cp -pPR bin/* ${D}${bindir}
-
- install -d ${D}${bindir}/qt4-examples
- for binary in `find examples -perm 0755 -type f`
- do
- install -m 0755 $binary ${D}${bindir}/qt4-examples/
- done
- install -d ${D}${bindir}/qt4-demos
- for binary in `find demos -perm 0755 -type f`
- do
- install -m 0755 $binary ${D}${bindir}/qt4-demos/
- done
- rm ${D}${bindir}/rcc ${D}${bindir}/uic ${D}${bindir}/moc
-}
-
require qt4-x11-free.inc
-
SRC_URI += " \
file://0002-fix-resinit-declaration.patch;patch=1 \
file://0006-freetype-host-includes.patch;patch=1 \
============================================================
--- packages/qt4/qt_packaging.inc 18b270dda2139ab49d6215c82bbee98a233c2e4c
+++ packages/qt4/qt_packaging.inc b5f063e7acbd8425fd911a5c5e4227c5ac7667c0
@@ -109,3 +109,15 @@ python populate_packages_prepend() {
translationdir = bb.data.expand('${datadir}/qtopia/translations/', d)
do_split_packages(d, translationdir, '^qt_(.*)\.qm$', 'qtopia-translation-%s', 'Qtopia translation for %s', extra_depends='' )
}
+
+
+do_install() {
+ oe_runmake install INSTALL_ROOT=${D}
+
+ # These are host binaries, we should only use them in staging
+ rm -rf ${D}/${bindir}
+ rm -rf ${D}/${datadir}/mkspecs
+
+ install -d ${D}/${libdir}/fonts
+ touch ${D}/${libdir}/fonts/fontdir
+}
============================================================
--- packages/qt4/qtopia-core.inc 0d29e4bbc489c30c90ac8e4dd65db22a8b35d162
+++ packages/qt4/qtopia-core.inc baffc460b4ec1f7a4c2fbbbcdc3ad5ae77b4f5ce
@@ -21,5 +21,6 @@ require qt_packaging.inc
QT_DIR_NAME = "qtopia"
require qt_depends.inc
require qt_packaging.inc
+require qt_staging.inc
inherit qtopia4core
============================================================
--- packages/qt4/qtopia-core_4.3.3.bb a8b51c0290334a4ffcc351751b0391c9f4952502
+++ packages/qt4/qtopia-core_4.3.3.bb d4c7ad00be94df45470607e15d0af953b69f996b
@@ -1,43 +1 @@
-QT_CONFIG_FLAGS += " \
- -nomake demos -nomake examples -nomake tools \
- -qt-mouse-tslib -qt-gfx-transformed -embedded ${QT_ARCH}"
-
-do_stage_append() {
- echo "Fixing up Qt"
- cd ${STAGING_LIBDIR}/pkgconfig
- sed -i s#"-L${S}/lib"##g Qt*.pc
- sed -i s#"moc_location=${S}/bin/moc"#moc_location=${STAGING_BINDIR}/moc4# Qt*.pc
- sed -i s#"uic_location=${S}/bin/uic"#uic_location=${STAGING_BINDIR}/uic4# Qt*.pc
-}
-
-do_install() {
- oe_runmake install INSTALL_ROOT=${D}
-
- # These are host binaries, we should only use them in staging
- rm -rf ${D}/${bindir}
- rm -rf ${D}/${datadir}/mkspecs
-
- touch ${D}/${libdir}/fonts/fontdir
-}
-
-
-
-STAGE_TEMP = "${WORKDIR}/temp-staging"
-do_stage() {
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- oe_runmake install INSTALL_ROOT=${STAGE_TEMP}
-
- install -d ${STAGING_INCDIR}/qtopiacore4
- install -d ${STAGING_LIBDIR}/qtopiacore4
- cp -pPRf ${STAGE_TEMP}/$includedir/* ${STAGING_INCDIR}/qtopiacore4/
-
- for i in ${STAGE_TEMP}/${libdir}/*.la
- do
- oe_libinstall -C ${STAGE_TEMP}/${libdir} -so $(basename $i .la) ${STAGING_LIBDIR}/qtopiacore4
- done
-
- rm -rf ${STAGE_TEMP}
-}
-
require qtopia-core.inc
More information about the Openembedded-commits
mailing list