From cb6bf045e9f7d5b0e6620d355505b521b467688a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Wed, 29 Sep 2004 19:52:47 +0000
Subject: fix mysql-native
BKrev: 415b128fZr6bWQXnAvYHVjRSrNsFLQ
---
mysql/mysql-native_4.1.4a.oe | 6 +++++-
mysql/mysql_4.1.4a.oe | 26 +++++++++++++++-----------
2 files changed, 20 insertions(+), 12 deletions(-)
(limited to 'mysql')
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"
+
--
cgit v1.2.3