summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-22 22:40:13 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-22 22:40:13 +0000
commit4439f3fd26db6b58f85b5e927600bad7d7a4539b (patch)
treec7c75d096d66c87409cb5d2ee9ec0162ba886da2 /packages
parent6ad3b4f697a0c942756e8c1c05ada98f2669804a (diff)
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/22 23:23:54+01:00 handhelds.org!zecke Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into handhelds.org:/home/ich/programming/oe/openembedded 2005/02/22 23:23:17+01:00 handhelds.org!zecke Qt 4.0 Beta1: -Create a qx114 bbclass to override qmake -Use version four for uic, moc, qrr -Correct fetching the source (tar.bz2 didn't work) and it is named opensource and not free -Mark it as BROKEN and add comments about known errors 2005/02/22 19:45:42+01:00 handhelds.org!zecke QPF Font Handling: Use the palmtopdir instead of hardcoding /opt/QtPalmtop BKrev: 421bb4cdX_F5PVSIybTGnWqDS-go_A
Diffstat (limited to 'packages')
-rw-r--r--packages/qt/qt-x11-free_4.0.0-b1.bb70
-rw-r--r--packages/uicmoc/uicmoc4-native_4.0.0-b1.bb10
2 files changed, 75 insertions, 5 deletions
diff --git a/packages/qt/qt-x11-free_4.0.0-b1.bb b/packages/qt/qt-x11-free_4.0.0-b1.bb
index e69de29bb2..ca2d1ddf77 100644
--- a/packages/qt/qt-x11-free_4.0.0-b1.bb
+++ b/packages/qt/qt-x11-free_4.0.0-b1.bb
@@ -0,0 +1,70 @@
+DESCRIPTION = "Qt/X11 Version ${PV}"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPL QPL"
+MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
+DEPENDS = "uicmoc4-native qmake-native-1.08a freetype x11 xft xext libxrender libxrandr libxcursor mysql"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-${PV}.tar.gz"
+S = "${WORKDIR}/qt-x11-opensource-${PV}"
+
+# Not the prime time of Qt4 yet
+# TODO: make it not look in /usr and /usr/include for its tests!
+DEFAULT_PREFERENCE = "-1"
+BROKEN = "1"
+
+PACKAGES += "qt-x11-plugins"
+FILES_qt-x11-plugins = "${prefix}/plugins"
+
+inherit qmake-base qt4x11
+
+export QTDIR = "${S}"
+STAGING_QT_DIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
+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-nis -no-cups -plugin-sql-mysql -verbose -stl"
+
+do_configure() {
+ echo "DEFINES -= QT_NO_CAST_TO_ASCII" >>src/qbase.pri
+ unset QMAKESPEC
+ echo yes | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast \
+ -L${STAGING_LIBDIR} -I${STAGING_INCDIR} -I${STAGING_INCDIR}/freetype2 -I${STAGING_INCDIR}/mysql
+}
+
+do_compile() {
+ unset CC LD CCLD CXX RANLIB AR STRIP CFLAGS LDFLAGS CXXFLAGS CPPFLAGS LINK
+ install -m 0755 ${STAGING_BINDIR}/rcc4 ${S}/bin/rcc
+ install -m 0755 ${STAGING_BINDIR}/moc4 ${S}/bin/moc
+ install -m 0755 ${STAGING_BINDIR}/uic4 ${S}/bin/uic
+
+ oe_runmake
+}
+
+do_stage() {
+ 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
+}
+
+do_install() {
+ install -d ${D}/${libdir}/
+ oe_soinstall lib/libqt-mt.so.${PV} ${D}/${libdir}/
+ oe_runmake -C plugins/src INSTALL_ROOT="${D}" \
+ QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
+ INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR} \
+ QMAKE_LIBS_QT=-lqt QMAKE_LIBS_QT_THREAD=-lqt-mt" \
+ QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
+ MOC="${STAGING_BINDIR}/moc4" UIC="${STAGING_BINDIR}/uic4" MAKE="make -e" \
+ install
+}
diff --git a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb
index 62729e29e3..9a7391ce38 100644
--- a/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb
+++ b/packages/uicmoc/uicmoc4-native_4.0.0-b1.bb
@@ -23,11 +23,11 @@ do_configure() {
do_compile() {
unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS
- cd ${S}/src/moc && make CC="${CC}" CXX="${CXX}"
- cd ${S}/src/core && make CC="${CC}" CXX="${CXX}"
- cd ${S}/src/xml && make CC="${CC}" CXX="${CXX}"
- cd ${S}/src/tools/uic && make CC="${CC}" CXX="${CXX}"
- cd ${S}/src/tools/rcc && make CC="${CC}" CXX="${CXX}"
+ cd ${S}/src/moc && oe_runmake CC="${CC}" CXX="${CXX}"
+ cd ${S}/src/core && oe_runmake CC="${CC}" CXX="${CXX}"
+ cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}"
+ cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}"
+ cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}"
}
do_stage() {