Merge bk://openembedded@openembedded.bkbits.net/packages

into stealth.(none):/home/pb/oe/oe-packages

2004/09/09 15:27:32+01:00 (none)!pb
fix up qt-x11 cross compile a bit


BKrev: 4140688a9_ASz2N6c5z5DfLg1mdZ4Q

3 files changed, 12 insertions, 33 deletions

diff --git a/qt/qt-x11-free-3.3.2/configure.patch b/qt/qt-x11-free-3.3.2/configure.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/qt/qt-x11-free-3.3.2/configure.patch
diff --git a/qt/qt-x11-free_3.3.1.oe b/qt/qt-x11-free_3.3.1.oe
deleted file mode 100644
index 19413e52e3..0000000000
--- a/qt/qt-x11-free_3.3.1.oe
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Qt is a versatile class library for graphical applications." 
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.1.tar.bz2"
-DEPENDS = "moc-native x11 libxft libpng zlib jpeg libsm xinerama libxcursor"
-
-do_configure () {
-	echo "yes" | ./configure -prefix ${prefix} -ipv6 -system-zlib -system-libpng -system-libjpeg
-}
-
-do_compile () {
-	top=`pwd`
-	cd $top/qmake; oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-	-I${S}/include/qmake -I${S}/include -I${S}/include \
-	-DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_STL \
-	-DQT_NO_COMPRESS -I${S}/mkspecs/linux-g++ -DHAVE_QCONFIG_CPP${CXXFLAGS}"
-	cd $top/src/moc; oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="-DQT_MOC -DQT_NO_CODECS -DQT_LITE_UNICODE -DQT_NO_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS ${CFLAGS}" CXXFLAGS="-DQT_MOC -DQT_NO_CODECS -DQT_LITE_UNICODE -DQT_NO_COMPONENT -DQT_NO_STL -DQT_NO_COMPRESS ${CXXFLAGS}" LINK="${CXX}" LFLAGS="${LDFLAGS}"
-	cd $top/src; oe_runmake CC="${CC}" CXX="${CXX}" CFLAGS="-Wall -W -fPIC -DQT_SHARED -DQT_NO_DEBUG -DQT_NO_CUPS -D_LARGEFILE_SOURCE -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -DQT_NO_IMAGEIO_MNG -DQT_NO_IMAGEIO_JPEG -DQT_NO_STYLE_MAC -DQT_NO_STYLE_AQUA -DQT_NO_STYLE_INTERLACE -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_COMPACT -DQT_NO_STYLE_POCKETPC ${CFLAGS}" CXXFLAGS="-Wall -W -fPIC -DQT_SHARED -DQT_NO_DEBUG -DQT_NO_CUPS -D_LARGEFILE_SOURCE -D_LARGE_FILES -D_FILE_OFFSET_BITS=64 -DQT_NO_IMAGEIO_MNG -DQT_NO_IMAGEIO_JPEG -DQT_NO_STYLE_MAC -DQT_NO_STYLE_AQUA -DQT_NO_STYLE_INTERLACE -DQT_NO_STYLE_WINDOWSXP -DQT_NO_STYLE_COMPACT -DQT_NO_STYLE_POCKETPC ${CXXFLAGS}" MOC="moc3" LINK="${CXX}" LFLAGS="${LDFLAGS} -shared -Wl,-soname,libqt.so.3 -Wl,-rpath,/var/tmp/oe-tmp.pb/base/qt-x11-free-3.3.1-r0/qt-x11-free-3.3.1/lib"
-}
-
-do_install () {
-	top=`pwd`
-	cd $top/qmake; oe_runmake INSTALL_ROOT="${D}" install
-	cd $top/moc; oe_runmake INSTALL_ROOT="${D}" install
-	cd $top/src; oe_runmake INSTALL_ROOT="${D}" install
-}
diff --git a/qt/qt-x11-free_3.3.2.oe b/qt/qt-x11-free_3.3.2.oe
index d34ac39403..18cc3809bd 100644
--- a/qt/qt-x11-free_3.3.2.oe
+++ b/qt/qt-x11-free_3.3.2.oe
@@ -2,9 +2,10 @@ DESCRIPTION = "Qt/X11 Version ${PV}"
 SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPL/QPL"
-DEPENDS = "qmake-native x11"
+DEPENDS = "qmake-native x11 xft xext libxrender uicmoc3-native"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-free-${PV}.tar.bz2 \
+	   file://configure.patch;patch=1 \
 	   file://no-examples.patch;patch=1"
 S = "${WORKDIR}/qt-x11-free-${PV}"
 
@@ -14,24 +15,26 @@ S = "${WORKDIR}/qt-x11-free-${PV}"
 #
 
 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"
+export MAKE="make -e"
 
-QT_CONFIG_FLAGS = "-release -shared -qt-zlib -no-nas-sound -no-sm -qt-libpng -no-gif -no-xshape -no-xinerama -no-xcursor -no-xrandr \
-                   -no-xrender -no-xft -no-tablet -no-xkb -no-dlopen-opengl -no-freetype -no-thread -no-nis -no-cups"
+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"
 
 do_configure() {
-	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast
+	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -fast -L${STAGING_LIBDIR} -I${STAGING_INCDIR}
 }
 
 do_compile() {
+	unset CFLAGS
+	unset CXXFLAGS
+	AR="${AR} cqs"
+	LIBS="" LINK="${BUILD_CXX}" CC="${BUILD_CC}" CXX="${BUILD_CXX}" oe_runmake -C src/moc
 	LD_LIBRARY_PATH=${S}/lib oe_runmake \
-		QMAKE="${STAGING_BINDIR}/qmake -after INCLUDEPATH+=${STAGING_INCDIR} LIBS+=-I${STAGING_LIBDIR}" \
-		QMAKESPEC="${THIS_QMAKESPEC}"
+		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} LIBS+=-L${STAGING_LIBDIR}" \
+		QMAKESPEC="${THIS_QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" MOC="moc3" UIC="uic3"
 }
 
 do_stage() {