fix mysql-native

BKrev: 415b128fZr6bWQXnAvYHVjRSrNsFLQ

3 files changed, 20 insertions, 89 deletions

diff --git a/mysql/mysql-native_4.1.4a.oe b/mysql/mysql-native_4.1.4a.oe
index b26d4c5313..ee1af05021 100644
--- a/mysql/mysql-native_4.1.4a.oe
+++ b/mysql/mysql-native_4.1.4a.oe
@@ -6,6 +6,10 @@ PACKAGES = ""
 DEPENDS = "ncurses-native"
 EXTRA_OEMAKE = ""
 
-do_stage () {
+do_stage() {
 	install -m 0755 sql/gen_lex_hash ${STAGING_BINDIR}/
 }
+
+do_install() {
+	:
+}
diff --git a/mysql/mysql_4.1.4a.oe b/mysql/mysql_4.1.4a.oe
index a71707b6a0..cf671cd79b 100644
--- a/mysql/mysql_4.1.4a.oe
+++ b/mysql/mysql_4.1.4a.oe
@@ -1,17 +1,13 @@
+DESCRIPTION = "The MySQL Open Source Database System"
+MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+SECTION = "libs"
+DEPENDS += "ncurses mysql-native"
 PR = "r1"
 
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "http://mirrors.develooper.com/mysql/Downloads/MySQL-4.1/mysql-${PV}-gamma.tar.gz \
-	   file://autofoo.patch;patch=1 \
-	   file://gen_lex_hash.patch;patch=1"
+           file://autofoo.patch;patch=1 \
+           file://gen_lex_hash.patch;patch=1"
 S = "${WORKDIR}/mysql-${PV}-gamma"
-DEPENDS += "ncurses mysql-native"
-
-PACKAGES =+ "libmysqlclient libmysqlclient-dev"
-
-FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*"
-FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \
-		${bindir}/mysql_config"
 
 inherit autotools
 
@@ -22,7 +18,15 @@ do_stage() {
 	oe_libinstall -a -so -C libmysql libmysqlclient ${STAGING_LIBDIR}
 }
 
-do_install_append() {
+do_install() {
+	oe_runmake install
 	mv -f ${D}${libdir}/mysql/* ${D}${libdir}
 	rmdir ${D}${libdir}/mysql
 }
+
+PACKAGES =+ "libmysqlclient libmysqlclient-dev"
+
+FILES_libmysqlclient = "${libdir}/libmysqlclient*.so.*"
+FILES_libmysqlclient-dev = "${incdir}/mysql ${libdir}/lib* \
+                ${bindir}/mysql_config"
+
diff --git a/qt/qt-x11-free_3.3.2.oe b/qt/qt-x11-free_3.3.2.oe
deleted file mode 100644
index f5049e2963..0000000000
--- a/qt/qt-x11-free_3.3.2.oe
+++ /dev/null
@@ -1,77 +0,0 @@
-DESCRIPTION = "Qt/X11 Version ${PV}"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "GPL/QPL"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-DEPENDS = "uicmoc3-native freetype x11 xft xext libxrender libxrandr libxcursor mysql"
-PR = "r4"
-
-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}"
-
-PACKAGES += "qt-x11-plugins"
-FILES_qt-x11-plugins = "${prefix}/plugins"
-
-inherit qmake-base
-
-export QTDIR = "${S}"
-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 -plugin-sql-mysql -verbose"
-
-do_configure() {
-	echo "yes" | ./configure -prefix ${prefix} ${QT_CONFIG_FLAGS} -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} )
-}
-
-do_compile() {
-	unset CFLAGS
-	unset CXXFLAGS
-#	cd src && oe_runmake QMAKESPEC="${QMAKESPEC}" QMAKE="${STAGING_BINDIR}/qmake" MOC="moc3" UIC="uic3" MAKE="make -e"
-	oe_runmake -C src \
-		QMAKE="${STAGING_BINDIR}/qmake -after INCPATH+=${STAGING_INCDIR} \
-		INCPATH+=${STAGING_INCDIR}/freetype2 LIBS+=-L${STAGING_LIBDIR}" \
-		QMAKESPEC="${QMAKESPEC}" LINK="${CXX} -Wl,-rpath-link,${STAGING_LIBDIR}" \
-		MOC="${STAGING_BINDIR}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"
-	oe_runmake -C plugins/src \
-		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}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e"
-}
-
-do_stage() {
-	oe_soinstall lib/libqt-mt.so.${PV} ${STAGING_LIBDIR}/
-	install -d ${STAGING_INCDIR}/private
-	for f in include/*.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/
-	done
-	for f in include/private/*.h
-	do
-	        install -m 0644 $f ${STAGING_INCDIR}/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}/moc3" UIC="${STAGING_BINDIR}/uic3" MAKE="make -e" \
-		install
-}