* [PATCH 0/2] Add qt3 to poky
@ 2011-03-01 7:12 Xiaofeng Yan
2011-03-01 7:12 ` [PATCH 1/2] qt3: Add qt3 because lsb test need it Xiaofeng Yan
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Xiaofeng Yan @ 2011-03-01 7:12 UTC (permalink / raw)
To: poky
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Packages qt3 from "OE" is needed by LSB Test Suite. So I add it to Poky.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/distro
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/distro
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (2):
qt3: Add qt3 because lsb test need it
qt3: Add two class(qt3e.bbclass and qt3x11.bbclass) files into
meta/classess/
meta/classes/qt3e.bbclass | 11 +++
meta/classes/qt3x11.bbclass | 15 ++++
meta/recipes-qt/qt3/qt-x11-free-common.inc | 91 +++++++++++++++++++++
meta/recipes-qt/qt3/qt-x11-free-native_3.3.5.bb | 65 +++++++++++++++
meta/recipes-qt/qt3/qt-x11-free/configure.patch | 51 ++++++++++++
meta/recipes-qt/qt3/qt-x11-free/gcc4_1-HACK.patch | 28 +++++++
meta/recipes-qt/qt3/qt-x11-free/no-examples.patch | 16 ++++
meta/recipes-qt/qt3/qt-x11-free_3.3.6.bb | 13 +++
meta/recipes-qt/qt3/qt-x11-free_3.3.7.bb | 16 ++++
9 files changed, 306 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/qt3e.bbclass
create mode 100644 meta/classes/qt3x11.bbclass
create mode 100644 meta/recipes-qt/qt3/qt-x11-free-common.inc
create mode 100644 meta/recipes-qt/qt3/qt-x11-free-native_3.3.5.bb
create mode 100644 meta/recipes-qt/qt3/qt-x11-free/configure.patch
create mode 100644 meta/recipes-qt/qt3/qt-x11-free/gcc4_1-HACK.patch
create mode 100644 meta/recipes-qt/qt3/qt-x11-free/no-examples.patch
create mode 100644 meta/recipes-qt/qt3/qt-x11-free_3.3.6.bb
create mode 100644 meta/recipes-qt/qt3/qt-x11-free_3.3.7.bb
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 1/2] qt3: Add qt3 because lsb test need it
2011-03-01 7:12 [PATCH 0/2] Add qt3 to poky Xiaofeng Yan
@ 2011-03-01 7:12 ` Xiaofeng Yan
2011-03-01 7:12 ` [PATCH 2/2] qt3: Add two class(qt3e.bbclass and qt3x11.bbclass) files into meta/classess/ Xiaofeng Yan
2011-03-01 10:23 ` [PATCH 0/2] Add qt3 to poky Paul Eggleton
2 siblings, 0 replies; 11+ messages in thread
From: Xiaofeng Yan @ 2011-03-01 7:12 UTC (permalink / raw)
To: poky
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
These package has been added from meta-openembedded.
Changes from the meta-openembedded version:
1 Add "-L ${STAGING_LIBDIR} -I ${STAGING_INCDIR_NATIVE}" to function do_configure() in file qt-x11-free-native_3.3.5.bb
2 Remove do_stage and transfer contents from do_stage to do_install in file qt-x11-free-native_3.3.5.bb
3 Add LIC_FILES_CHKSUM in file qt-x11-free-native_3.3.5.bb
4 Remove -plugin-sql-mysql from "QT_CONFIG_FLAGS" in file qt-x11-free-common.inc
5 Add "install -m 0755 ${STAGING_BINDIR_NATIVE}/moc3 ${S}/bin/moc install -m 0755 ${STAGING_BINDIR_NATIVE}/uic3 ${S}/bin/uic" to function do_compile() in file qt-x11-free-common.inc
6 Change do_stage to do_install_prepend in file qt-x11-free-common.inc
7 Add LIC_FILES_CHKSUM in file qt-x11-free_3.3.7.bb
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-qt/qt3/qt-x11-free-common.inc | 91 +++++++++++++++++++++
meta/recipes-qt/qt3/qt-x11-free-native_3.3.5.bb | 65 +++++++++++++++
meta/recipes-qt/qt3/qt-x11-free/configure.patch | 51 ++++++++++++
meta/recipes-qt/qt3/qt-x11-free/gcc4_1-HACK.patch | 28 +++++++
meta/recipes-qt/qt3/qt-x11-free/no-examples.patch | 16 ++++
meta/recipes-qt/qt3/qt-x11-free_3.3.6.bb | 13 +++
meta/recipes-qt/qt3/qt-x11-free_3.3.7.bb | 16 ++++
7 files changed, 280 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-qt/qt3/qt-x11-free-common.inc
create mode 100644 meta/recipes-qt/qt3/qt-x11-free-native_3.3.5.bb
create mode 100644 meta/recipes-qt/qt3/qt-x11-free/configure.patch
create mode 100644 meta/recipes-qt/qt3/qt-x11-free/gcc4_1-HACK.patch
create mode 100644 meta/recipes-qt/qt3/qt-x11-free/no-examples.patch
create mode 100644 meta/recipes-qt/qt3/qt-x11-free_3.3.6.bb
create mode 100644 meta/recipes-qt/qt3/qt-x11-free_3.3.7.bb
diff --git a/meta/recipes-qt/qt3/qt-x11-free-common.inc b/meta/recipes-qt/qt3/qt-x11-free-common.inc
new file mode 100644
index 0000000..8afcbd8
--- /dev/null
+++ b/meta/recipes-qt/qt3/qt-x11-free-common.inc
@@ -0,0 +1,91 @@
+DESCRIPTION = "Qt/X11 Version ${PV} is a full fledged cross-platform application framework"
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+HOMEPAGE = "http://www.trolltech.com"
+
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+inherit qmake_base qt3x11
+
+export QTDIR = "${S}"
+STAGING_QT_DIR = "${STAGING_DIR_HOST}/qt3"
+ARCH_i686 = "x86"
+EXTRA_OEMAKE = "-e"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xinerama \
+ -no-tablet -no-xkb -no-dlopen-opengl -no-nis -no-cups -thread -verbose"
+
+EXTRA_ENV = 'QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCPATH+=${STAGING_INCDIR} \
+ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+ AR="${TARGET_PREFIX}ar cqs" \
+ MOC="${STAGING_BINDIR_NATIVE}/moc3" UIC="${STAGING_BINDIR_NATIVE}/uic3" MAKE="make -e"'
+
+do_configure() {
+ echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -no-fast \
+ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
+
+ # force regenerate
+ rm -f src/qtmain.pro
+ cat Makefile >makefile
+ find . -name "Makefile"|xargs rm -f
+ (cd src && qmake -spec ${QMAKESPEC} )
+ (cd plugins/src && qmake -spec ${QMAKESPEC} )
+ (cd tools && qmake -spec ${QMAKESPEC} )
+ (cd tools/qvfb && qmake -spec ${QMAKESPEC} )
+}
+
+do_compile() {
+ unset CFLAGS
+ unset CXXFLAGS
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/moc3 ${S}/bin/moc
+ install -m 0755 ${STAGING_BINDIR_NATIVE}/uic3 ${S}/bin/uic
+
+ oe_runmake -C src ${EXTRA_ENV}
+ oe_runmake -C plugins/src ${EXTRA_ENV}
+ oe_runmake -C tools ${EXTRA_ENV}
+ oe_runmake -C tools/qvfb ${EXTRA_ENV}
+}
+
+do_install_prepend() {
+ install -d ${STAGING_QT_DIR}/bin
+ ln -sf ${STAGING_BINDIR_NATIVE}/moc3 ${STAGING_QT_DIR}/bin/moc
+ ln -sf ${STAGING_BINDIR_NATIVE}/uic3 ${STAGING_QT_DIR}/bin/uic
+ ln -sf ${STAGING_BINDIR_NATIVE}/qmake ${STAGING_QT_DIR}/bin/qmake
+ install -d ${STAGING_QT_DIR}/lib
+ oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_QT_DIR}/lib
+ install -d ${STAGING_QT_DIR}/include/private
+ for f in include/*.h
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/include/
+ done
+ for f in include/private/*.h
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/include/private
+ done
+ for f in lib/*.prl
+ do
+ install -m 0644 $f ${STAGING_QT_DIR}/lib
+ done
+}
+
+do_install() {
+ install -d ${D}${libdir}/
+ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+ install -d ${D}${bindir}/
+ install -m 0755 bin/designer bin/assistant tools/qvfb/qvfb bin/qtconfig ${D}${bindir}
+ install -d ${D}${prefix}/plugins/
+ cp -pPR plugins/imageformats plugins/sqldrivers plugins/designer ${D}${prefix}/plugins/
+}
+
+PACKAGES =+ "qt-x11-plugins-imageformats qt-x11-plugins-sqldrivers qt-x11-plugins-designer \
+ qt-x11-designer qt-x11-assistant qt-x11-qvfb qt-x11-qtconfig"
+FILES_qt-x11-plugins-imageformats = "${prefix}/plugins/imageformats/*.so"
+FILES_qt-x11-plugins-sqldrivers = "${prefix}/plugins/sqldrivers/*.so"
+FILES_qt-x11-plugins-designer = "${prefix}/plugins/designer/*.so"
+FILES_qt-x11-designer = "${bindir}/designer"
+FILES_qt-x11-assistant = "${bindir}/assistant"
+FILES_qt-x11-qvfb = "${bindir}/qvfb"
+FILES_qt-x11-qtconfig = "${bindir}/qtconfig"
+FILES_qt-x11-dbg += "${prefix}/plugins/*/.debug ${D}/qt-x11-plugins-debug"
diff --git a/meta/recipes-qt/qt3/qt-x11-free-native_3.3.5.bb b/meta/recipes-qt/qt3/qt-x11-free-native_3.3.5.bb
new file mode 100644
index 0000000..62ae18f
--- /dev/null
+++ b/meta/recipes-qt/qt3/qt-x11-free-native_3.3.5.bb
@@ -0,0 +1,65 @@
+DESCRIPTION = "Qt/X11 Version ${PV}"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+DEPENDS = "qmake-native x11-native"
+HOMEPAGE = "http://www.trolltech.com"
+
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/qt-x11-free"
+
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=629178675a7d49c9fa19dfe9f43ea256 \
+ file://LICENSE.QPL;md5=fff372435cb41647bc0b3cb940ea5c51"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://no-examples.patch"
+S = "${WORKDIR}/qt-x11-free-${PV}"
+
+#
+# FIXME - This should be updated to use OE's qmake_base.oeclass
+# or the full qmake.oeclass.
+#
+
+export QTDIR = "${S}"
+export SYSCONF_CXX = "${CCACHE} g++"
+export SYSCONF_CC = "${CCACHE} gcc"
+export SYSCONF_LINK = "${CCACHE} g++"
+THIS_QMAKESPEC = "${STAGING_DATADIR}/qmake/${TARGET_OS}-oe-g++"
+export QMAKESPEC = ""
+ARCH_i686 = "x86"
+
+QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -qt-gif -no-xshape -no-xinerama -no-xcursor -no-xrandr \
+ -no-xrender -no-xft -no-tablet -no-xkb -no-dlopen-opengl -no-freetype -no-nis -no-cups -stl -thread -no-exceptions"
+
+
+inherit native
+
+do_configure() {
+ echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast -L ${STAGING_LIBDIR} \
+ -I ${STAGING_INCDIR_NATIVE}
+}
+
+do_compile() {
+ LD_LIBRARY_PATH=${S}/lib oe_runmake \
+ QMAKE="${STAGING_BINDIR_NATIVE}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-L${STAGING_LIBDIR}" \
+ QMAKESPEC="${THIS_QMAKESPEC}"
+}
+
+
+do_install() {
+ install -d ${D}${bindir}/
+ install -m 0755 bin/qmake ${D}${bindir}/qmake2
+ for i in moc uic lrelease lupdate; do
+ install -m 0755 bin/${i} ${D}${bindir}/${i}3
+ done
+
+ install -d ${D}${datadir}/qt3/
+ cp -PfR mkspecs ${D}${datadir}/qt3/
+ ln -sf linux-g++ ${D}${datadir}/qt3/mkspecs/${BUILD_OS}-oe-g++
+ ln -s ${D}${datadir}/qt3/mkspecs/ ${D}${datadir}/qmake
+ install -d ${D}${libdir}/
+ oe_soinstall lib/libqt-mt.so.${PV} ${D}${libdir}/
+}
+
+
+SRC_URI[md5sum] = "05d04688c0c0230ed54e89102d689ca4"
+SRC_URI[sha256sum] = "aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96"
diff --git a/meta/recipes-qt/qt3/qt-x11-free/configure.patch b/meta/recipes-qt/qt3/qt-x11-free/configure.patch
new file mode 100644
index 0000000..9d6c1e8
--- /dev/null
+++ b/meta/recipes-qt/qt3/qt-x11-free/configure.patch
@@ -0,0 +1,51 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-free-3.3.2/configure~configure.patch
++++ qt-x11-free-3.3.2/configure
+@@ -1754,21 +1754,14 @@
+ CFG_FREETYPE=yes
+ fi
+ fi
+- # add freetype2 include path
+- if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.inc ];then
+- QMAKE_VARS="$QMAKE_VARS \"INCLUDEPATH+=`cat $outpath/config.tests/x11/xft.inc`\""
+- fi
+- rm -f $outpath/config.tests/x11/xft.inc
+ # add Xft specific libraries
+ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.lib ]; then
+ QMAKE_VARS="$QMAKE_VARS \"QMAKE_LIBS_X11=`cat $outpath/config.tests/x11/xft.lib` \$\$QMAKE_LIBS_X11\""
+ fi
+- rm -f $outpath/config.tests/x11/xft.lib
+ # add Xft specific config options
+ if [ "$CFG_FREETYPE" = "yes" ] && [ -f $outpath/config.tests/x11/xft.cfg ]; then
+ QMAKE_CONFIG="$QMAKE_CONFIG `cat $outpath/config.tests/x11/xft.cfg`"
+ fi
+- rm -f $outpath/config.tests/x11/xft.cfg
+ # auto-detect Session Management support
+ if [ "$CFG_SM" = "auto" ]; then
+ if $x11tests/sm.test $XQMAKESPEC $OPT_VERBOSE $L_FLAGS $I_FLAGS; then
+@@ -2553,12 +2546,6 @@
+ (cd $outpath/qmake; $MAKE || (echo "qmake failed to build. Aborting." && exit 2)) || exit 2
+ fi
+
+-# clean up temporary qconfig.h and qmodules.h
+-rm -f $outpath/include/qmake/qconfig.h
+-rm -f $outpath/include/qmake/qmodules.h
+-rmdir $outpath/include/qmake
+-
+-
+ #-------------------------------------------------------------------------------
+ # tests that need qmake
+ #-------------------------------------------------------------------------------
+@@ -3605,7 +3592,7 @@
+
+ EOF
+ else
+- EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a"
++ EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a $OE_EXTRA_QMAKE"
+ if [ "$OPT_VERBOSE" = "yes" ]; then
+ echo " (`basename $SPEC`)"
+ if echo '\c' | grep '\c' >/dev/null; then
diff --git a/meta/recipes-qt/qt3/qt-x11-free/gcc4_1-HACK.patch b/meta/recipes-qt/qt3/qt-x11-free/gcc4_1-HACK.patch
new file mode 100644
index 0000000..818bced
--- /dev/null
+++ b/meta/recipes-qt/qt3/qt-x11-free/gcc4_1-HACK.patch
@@ -0,0 +1,28 @@
+
+#
+# Patch managed by http://www.holgerschurig.de/patcher.html
+#
+
+--- qt-x11-free-3.3.6/src/tools/qstring.h~gcc4_1.patch
++++ qt-x11-free-3.3.6/src/tools/qstring.h
+@@ -60,7 +60,7 @@
+ #endif
+ #endif
+
+-
++#define Q_NO_PACKED_REFERENCE
+ /*****************************************************************************
+ QString class
+ *****************************************************************************/
+@@ -194,9 +194,9 @@
+ char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
+ ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+- ushort &unicode() { return *(&ucs); }
++ ushort &unicode() { return *((ushort*)&ucs); }
+ #else
+- ushort &unicode() { return ucs; }
++ ushort &unicode() { return (ushort)ucs; }
+ #endif
+ #ifndef QT_NO_CAST_ASCII
+ // like all ifdef'd code this is undocumented
diff --git a/meta/recipes-qt/qt3/qt-x11-free/no-examples.patch b/meta/recipes-qt/qt3/qt-x11-free/no-examples.patch
new file mode 100644
index 0000000..b0ee637
--- /dev/null
+++ b/meta/recipes-qt/qt3/qt-x11-free/no-examples.patch
@@ -0,0 +1,16 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- qt-embedded-free-3.3.2/Makefile~no-examples 2003-08-11 16:37:25.000000000 +0200
++++ qt-embedded-free-3.3.2/Makefile 2004-05-11 15:53:53.000000000 +0200
+@@ -11,7 +11,7 @@
+ install: FORCE
+ @$(MAKE) qt.install
+
+-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
++all: symlinks src-qmake src-moc sub-src sub-tools
+ @echo
+ @echo "The Qt library is now built in ./lib"
+ @echo "The Qt examples are built in the directories in ./examples"
diff --git a/meta/recipes-qt/qt3/qt-x11-free_3.3.6.bb b/meta/recipes-qt/qt3/qt-x11-free_3.3.6.bb
new file mode 100644
index 0000000..789e6fb
--- /dev/null
+++ b/meta/recipes-qt/qt3/qt-x11-free_3.3.6.bb
@@ -0,0 +1,13 @@
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxft libxext libxrender libxrandr libxcursor mysql virtual/libgl"
+PROVIDES = "qt3x11"
+PR = "r3"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://configure.patch \
+ file://no-examples.patch \
+ file://gcc4_1-HACK.patch"
+
+require qt-x11-free-common.inc
+
+SRC_URI[md5sum] = "dc1384c03ac08af21f6fefab32d982cf"
+SRC_URI[sha256sum] = "04f12083f6a6f7a8fd4d34a6c1efd37db76a67580c424f4fb7b7c43c0565e6ae"
diff --git a/meta/recipes-qt/qt3/qt-x11-free_3.3.7.bb b/meta/recipes-qt/qt3/qt-x11-free_3.3.7.bb
new file mode 100644
index 0000000..61d4f1f
--- /dev/null
+++ b/meta/recipes-qt/qt3/qt-x11-free_3.3.7.bb
@@ -0,0 +1,16 @@
+DEPENDS = "uicmoc3-native freetype virtual/libx11 libxmu libxft libxext libxrender libxrandr libxcursor virtual/libgl"
+PROVIDES = "qt3x11"
+PR = "r4"
+
+LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b07b0d5ac6b1822effe47173a1744433 \
+ file://LICENSE.QPL;md5=b81b6b6fc04ed873adde5aa901c0613b"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+ file://configure.patch \
+ file://no-examples.patch \
+ file://gcc4_1-HACK.patch"
+
+require qt-x11-free-common.inc
+
+SRC_URI[md5sum] = "655e21cf6a7e66daf8ec6ceda81aae1e"
+SRC_URI[sha256sum] = "48c05b501029f0640db665fbc7f981a0efbf69ad3cf87a43c5eea4872f4f7ba1"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 2/2] qt3: Add two class(qt3e.bbclass and qt3x11.bbclass) files into meta/classess/
2011-03-01 7:12 [PATCH 0/2] Add qt3 to poky Xiaofeng Yan
2011-03-01 7:12 ` [PATCH 1/2] qt3: Add qt3 because lsb test need it Xiaofeng Yan
@ 2011-03-01 7:12 ` Xiaofeng Yan
2011-03-01 10:23 ` [PATCH 0/2] Add qt3 to poky Paul Eggleton
2 siblings, 0 replies; 11+ messages in thread
From: Xiaofeng Yan @ 2011-03-01 7:12 UTC (permalink / raw)
To: poky
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Two files from OE are needed to compile qt3
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/classes/qt3e.bbclass | 11 +++++++++++
meta/classes/qt3x11.bbclass | 15 +++++++++++++++
2 files changed, 26 insertions(+), 0 deletions(-)
create mode 100644 meta/classes/qt3e.bbclass
create mode 100644 meta/classes/qt3x11.bbclass
diff --git a/meta/classes/qt3e.bbclass b/meta/classes/qt3e.bbclass
new file mode 100644
index 0000000..d3d4a14
--- /dev/null
+++ b/meta/classes/qt3e.bbclass
@@ -0,0 +1,11 @@
+#
+# override variables set by qmake_base to compile Qt/X11 apps
+#
+export QTDIR="${STAGING_DIR_HOST}/qte3"
+export QTEDIR="${STAGING_DIR_HOST}/qte3"
+export OE_QMAKE_UIC="${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC="${STAGING_BINDIR_NATIVE}/moc3"
+export OE_QMAKE_CXXFLAGS="${CXXFLAGS} "
+export OE_QMAKE_INCDIR_QT="${STAGING_INCDIR}/qte3/include"
+export OE_QMAKE_LIBDIR_QT="${STAGING_LIBDIR}/qte3/lib"
+export OE_QMAKE_LIBS_QT="qte"
diff --git a/meta/classes/qt3x11.bbclass b/meta/classes/qt3x11.bbclass
new file mode 100644
index 0000000..5408b7f
--- /dev/null
+++ b/meta/classes/qt3x11.bbclass
@@ -0,0 +1,15 @@
+DEPENDS_prepend = "${@["qt3x11 ", ""][(bb.data.getVar('PN', d, 1) == 'qt-x11-free')]}"
+EXTRA_QMAKEVARS_POST += "CONFIG+=thread"
+#
+# override variables set by qmake_base to compile Qt/X11 apps
+#
+export QTDIR = "${STAGING_DIR_HOST}/qt3"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic3"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc3"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS} -DQT_NO_XIM"
+export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
+export OE_QMAKE_LIBS_OPENGL = "-lGLU -lGL -lXmu"
+export OE_QMAKE_LIBS_OPENGL_QT = "-lGL -lXmu"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Add qt3 to poky
2011-03-01 7:12 [PATCH 0/2] Add qt3 to poky Xiaofeng Yan
2011-03-01 7:12 ` [PATCH 1/2] qt3: Add qt3 because lsb test need it Xiaofeng Yan
2011-03-01 7:12 ` [PATCH 2/2] qt3: Add two class(qt3e.bbclass and qt3x11.bbclass) files into meta/classess/ Xiaofeng Yan
@ 2011-03-01 10:23 ` Paul Eggleton
2011-03-01 10:33 ` Koen Kooi
2 siblings, 1 reply; 11+ messages in thread
From: Paul Eggleton @ 2011-03-01 10:23 UTC (permalink / raw)
To: poky
On Tuesday 01 March 2011 07:12:09 Xiaofeng Yan wrote:
> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>
> Packages qt3 from "OE" is needed by LSB Test Suite. So I add it to Poky.
If we're adding this solely for LSB compliance, do we need the "embedded"
portions of Qt3 (i.e. qt3e.bbclass)? AFAICT the LSB documentation doesn't
mention it explicitly and if we don't add it it's one less thing we have to
support (I'm convinced it's not widely used in any case).
Cheers,
Paul
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Add qt3 to poky
2011-03-01 10:23 ` [PATCH 0/2] Add qt3 to poky Paul Eggleton
@ 2011-03-01 10:33 ` Koen Kooi
2011-03-01 16:24 ` Paul Eggleton
0 siblings, 1 reply; 11+ messages in thread
From: Koen Kooi @ 2011-03-01 10:33 UTC (permalink / raw)
To: Paul Eggleton; +Cc: poky
Op 1 mrt 2011, om 11:23 heeft Paul Eggleton het volgende geschreven:
> On Tuesday 01 March 2011 07:12:09 Xiaofeng Yan wrote:
>> From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
>>
>> Packages qt3 from "OE" is needed by LSB Test Suite. So I add it to Poky.
>
> If we're adding this solely for LSB compliance, do we need the "embedded"
> portions of Qt3 (i.e. qt3e.bbclass)? AFAICT the LSB documentation doesn't
> mention it explicitly and if we don't add it it's one less thing we have to
> support (I'm convinced it's not widely used in any case).
And since there was never a qtopia for qt3 I highly doubt anyone is using qt3/e.
regards,
Koen
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Add qt3 to poky
2011-03-01 10:33 ` Koen Kooi
@ 2011-03-01 16:24 ` Paul Eggleton
2011-03-02 1:32 ` Xiaofeng Yan
0 siblings, 1 reply; 11+ messages in thread
From: Paul Eggleton @ 2011-03-01 16:24 UTC (permalink / raw)
To: Koen Kooi; +Cc: poky@pokylinux.org
On Tuesday 01 March 2011 10:33:08 you wrote:
> And since there was never a qtopia for qt3 I highly doubt anyone is using
> qt3/e.
Well, you never know what people are doing behind closed doors. There was also
once a version of SystemRescueCD that was using the then-current version of
QtParted with Qt/Embedded 3.x to avoid including X.
For our purposes though it's only for LSB at this stage, so embedded appears
to be superfluous.
Cheers,
Paul
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Add qt3 to poky
2011-03-01 16:24 ` Paul Eggleton
@ 2011-03-02 1:32 ` Xiaofeng Yan
2011-03-02 1:36 ` Mark Hatle
0 siblings, 1 reply; 11+ messages in thread
From: Xiaofeng Yan @ 2011-03-02 1:32 UTC (permalink / raw)
To: poky
On 2011年03月02日 00:24, Paul Eggleton wrote:
> On Tuesday 01 March 2011 10:33:08 you wrote:
>> And since there was never a qtopia for qt3 I highly doubt anyone is using
>> qt3/e.
> Well, you never know what people are doing behind closed doors. There was also
> once a version of SystemRescueCD that was using the then-current version of
> QtParted with Qt/Embedded 3.x to avoid including X.
>
> For our purposes though it's only for LSB at this stage, so embedded appears
> to be superfluous.
>
> Cheers,
> Paul
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
>
Hi All,
Qt3 could be superfluous because qt4 can include qt3 functions. But the
most important is that our lsb-image must meet LSB's requirement.
Otherwise our yocto can't be permitted to use the LSB Certified
trademark. So qt3 is just for passing LSB test on lsb-image.
Thanks
Yan
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Add qt3 to poky
2011-03-02 1:32 ` Xiaofeng Yan
@ 2011-03-02 1:36 ` Mark Hatle
2011-03-02 3:03 ` Saul Wold
0 siblings, 1 reply; 11+ messages in thread
From: Mark Hatle @ 2011-03-02 1:36 UTC (permalink / raw)
To: poky
I think we should be sure to clearly label the Qt3 as only provided for LSB
compatibility in the recipe, that way if someone tries to use it, they can
understand why it was added/maintained.
--Mark
On 3/1/11 7:32 PM, Xiaofeng Yan wrote:
> On 2011年03月02日 00:24, Paul Eggleton wrote:
>> On Tuesday 01 March 2011 10:33:08 you wrote:
>>> And since there was never a qtopia for qt3 I highly doubt anyone is using
>>> qt3/e.
>> Well, you never know what people are doing behind closed doors. There was also
>> once a version of SystemRescueCD that was using the then-current version of
>> QtParted with Qt/Embedded 3.x to avoid including X.
>>
>> For our purposes though it's only for LSB at this stage, so embedded appears
>> to be superfluous.
>>
>> Cheers,
>> Paul
>> _______________________________________________
>> poky mailing list
>> poky@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/poky
>>
> Hi All,
>
> Qt3 could be superfluous because qt4 can include qt3 functions. But the
> most important is that our lsb-image must meet LSB's requirement.
> Otherwise our yocto can't be permitted to use the LSB Certified
> trademark. So qt3 is just for passing LSB test on lsb-image.
>
> Thanks
> Yan
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Add qt3 to poky
2011-03-02 1:36 ` Mark Hatle
@ 2011-03-02 3:03 ` Saul Wold
2011-03-02 3:12 ` Mark Hatle
0 siblings, 1 reply; 11+ messages in thread
From: Saul Wold @ 2011-03-02 3:03 UTC (permalink / raw)
To: Mark Hatle; +Cc: poky
On 03/01/2011 05:36 PM, Mark Hatle wrote:
> I think we should be sure to clearly label the Qt3 as only provided for LSB
> compatibility in the recipe, that way if someone tries to use it, they can
> understand why it was added/maintained.
>
Mark,
I thought we talked about this before, I did not think we where going
for 100% compliant in core yocto, and if needed, this can be part of the
WR layer in order to complete compliance. I don't think we want to
carry around a recipe that is purely for compatibility at that level.
Sau!
> --Mark
>
> On 3/1/11 7:32 PM, Xiaofeng Yan wrote:
>> On 2011年03月02日 00:24, Paul Eggleton wrote:
>>> On Tuesday 01 March 2011 10:33:08 you wrote:
>>>> And since there was never a qtopia for qt3 I highly doubt anyone is using
>>>> qt3/e.
>>> Well, you never know what people are doing behind closed doors. There was also
>>> once a version of SystemRescueCD that was using the then-current version of
>>> QtParted with Qt/Embedded 3.x to avoid including X.
>>>
>>> For our purposes though it's only for LSB at this stage, so embedded appears
>>> to be superfluous.
>>>
>>> Cheers,
>>> Paul
>>> _______________________________________________
>>> poky mailing list
>>> poky@yoctoproject.org
>>> https://lists.yoctoproject.org/listinfo/poky
>>>
>> Hi All,
>>
>> Qt3 could be superfluous because qt4 can include qt3 functions. But the
>> most important is that our lsb-image must meet LSB's requirement.
>> Otherwise our yocto can't be permitted to use the LSB Certified
>> trademark. So qt3 is just for passing LSB test on lsb-image.
>>
>> Thanks
>> Yan
>> _______________________________________________
>> poky mailing list
>> poky@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/poky
>
> _______________________________________________
> poky mailing list
> poky@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/poky
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Add qt3 to poky
2011-03-02 3:03 ` Saul Wold
@ 2011-03-02 3:12 ` Mark Hatle
2011-03-02 3:24 ` Saul Wold
0 siblings, 1 reply; 11+ messages in thread
From: Mark Hatle @ 2011-03-02 3:12 UTC (permalink / raw)
To: Saul Wold; +Cc: poky
On 3/1/11 9:03 PM, Saul Wold wrote:
> On 03/01/2011 05:36 PM, Mark Hatle wrote:
>> I think we should be sure to clearly label the Qt3 as only provided for LSB
>> compatibility in the recipe, that way if someone tries to use it, they can
>> understand why it was added/maintained.
>>
> Mark,
>
> I thought we talked about this before, I did not think we where going
> for 100% compliant in core yocto, and if needed, this can be part of the
> WR layer in order to complete compliance. I don't think we want to
> carry around a recipe that is purely for compatibility at that level.
What I remember is we were not sure it would go into 1.0. And we were not yet
sure what we wanted to do with a QT compatibility library, if it would ever go
into "meta", another layer, or...
I think LSB compliance makes sense in the meta layer because of the new
"poky-lsb" distro. It shouldn't hurt to carry this forward and maintain it for
compatibility sake as part of the poky-lsb work. (But I won't complain if it
doesn't make it into 1.0, and we delay a final decision on if it goes in at all
until later -- I just want to make sure the code isn't lost though...)
--Mark
> Sau!
>
>> --Mark
>>
>> On 3/1/11 7:32 PM, Xiaofeng Yan wrote:
>>> On 2011年03月02日 00:24, Paul Eggleton wrote:
>>>> On Tuesday 01 March 2011 10:33:08 you wrote:
>>>>> And since there was never a qtopia for qt3 I highly doubt anyone is using
>>>>> qt3/e.
>>>> Well, you never know what people are doing behind closed doors. There was also
>>>> once a version of SystemRescueCD that was using the then-current version of
>>>> QtParted with Qt/Embedded 3.x to avoid including X.
>>>>
>>>> For our purposes though it's only for LSB at this stage, so embedded appears
>>>> to be superfluous.
>>>>
>>>> Cheers,
>>>> Paul
>>>> _______________________________________________
>>>> poky mailing list
>>>> poky@yoctoproject.org
>>>> https://lists.yoctoproject.org/listinfo/poky
>>>>
>>> Hi All,
>>>
>>> Qt3 could be superfluous because qt4 can include qt3 functions. But the
>>> most important is that our lsb-image must meet LSB's requirement.
>>> Otherwise our yocto can't be permitted to use the LSB Certified
>>> trademark. So qt3 is just for passing LSB test on lsb-image.
>>>
>>> Thanks
>>> Yan
>>> _______________________________________________
>>> poky mailing list
>>> poky@yoctoproject.org
>>> https://lists.yoctoproject.org/listinfo/poky
>>
>> _______________________________________________
>> poky mailing list
>> poky@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/poky
>
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 0/2] Add qt3 to poky
2011-03-02 3:12 ` Mark Hatle
@ 2011-03-02 3:24 ` Saul Wold
0 siblings, 0 replies; 11+ messages in thread
From: Saul Wold @ 2011-03-02 3:24 UTC (permalink / raw)
To: Mark Hatle; +Cc: poky@yoctoproject.org
On 03/01/2011 07:12 PM, Mark Hatle wrote:
> On 3/1/11 9:03 PM, Saul Wold wrote:
>> On 03/01/2011 05:36 PM, Mark Hatle wrote:
>>> I think we should be sure to clearly label the Qt3 as only provided for LSB
>>> compatibility in the recipe, that way if someone tries to use it, they can
>>> understand why it was added/maintained.
>>>
>> Mark,
>>
>> I thought we talked about this before, I did not think we where going
>> for 100% compliant in core yocto, and if needed, this can be part of the
>> WR layer in order to complete compliance. I don't think we want to
>> carry around a recipe that is purely for compatibility at that level.
>
> What I remember is we were not sure it would go into 1.0. And we were not yet
> sure what we wanted to do with a QT compatibility library, if it would ever go
> into "meta", another layer, or...
>
> I think LSB compliance makes sense in the meta layer because of the new
> "poky-lsb" distro. It shouldn't hurt to carry this forward and maintain it for
> compatibility sake as part of the poky-lsb work. (But I won't complain if it
> doesn't make it into 1.0, and we delay a final decision on if it goes in at all
> until later -- I just want to make sure the code isn't lost though...)
>
I would like to hold off on this change at this point.
We can visit later.
Thanks
Sau!
> --Mark
>
>> Sau!
>>
>>> --Mark
>>>
>>> On 3/1/11 7:32 PM, Xiaofeng Yan wrote:
>>>> On 2011年03月02日 00:24, Paul Eggleton wrote:
>>>>> On Tuesday 01 March 2011 10:33:08 you wrote:
>>>>>> And since there was never a qtopia for qt3 I highly doubt anyone is using
>>>>>> qt3/e.
>>>>> Well, you never know what people are doing behind closed doors. There was also
>>>>> once a version of SystemRescueCD that was using the then-current version of
>>>>> QtParted with Qt/Embedded 3.x to avoid including X.
>>>>>
>>>>> For our purposes though it's only for LSB at this stage, so embedded appears
>>>>> to be superfluous.
>>>>>
>>>>> Cheers,
>>>>> Paul
>>>>> _______________________________________________
>>>>> poky mailing list
>>>>> poky@yoctoproject.org
>>>>> https://lists.yoctoproject.org/listinfo/poky
>>>>>
>>>> Hi All,
>>>>
>>>> Qt3 could be superfluous because qt4 can include qt3 functions. But the
>>>> most important is that our lsb-image must meet LSB's requirement.
>>>> Otherwise our yocto can't be permitted to use the LSB Certified
>>>> trademark. So qt3 is just for passing LSB test on lsb-image.
>>>>
>>>> Thanks
>>>> Yan
>>>> _______________________________________________
>>>> poky mailing list
>>>> poky@yoctoproject.org
>>>> https://lists.yoctoproject.org/listinfo/poky
>>>
>>> _______________________________________________
>>> poky mailing list
>>> poky@yoctoproject.org
>>> https://lists.yoctoproject.org/listinfo/poky
>>
>
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-03-02 3:24 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-01 7:12 [PATCH 0/2] Add qt3 to poky Xiaofeng Yan
2011-03-01 7:12 ` [PATCH 1/2] qt3: Add qt3 because lsb test need it Xiaofeng Yan
2011-03-01 7:12 ` [PATCH 2/2] qt3: Add two class(qt3e.bbclass and qt3x11.bbclass) files into meta/classess/ Xiaofeng Yan
2011-03-01 10:23 ` [PATCH 0/2] Add qt3 to poky Paul Eggleton
2011-03-01 10:33 ` Koen Kooi
2011-03-01 16:24 ` Paul Eggleton
2011-03-02 1:32 ` Xiaofeng Yan
2011-03-02 1:36 ` Mark Hatle
2011-03-02 3:03 ` Saul Wold
2011-03-02 3:12 ` Mark Hatle
2011-03-02 3:24 ` Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.