update mysql to 5.0 (fix #9)

SVN-Revision: 2889

openwrt/package/mysql/Makefile

@@ -3,16 +3,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mysql
-PKG_VERSION:=4.0.24
-PKG_RELEASE:=2
-PKG_MD5SUM:=408d3001ed715ddc90009c247e548638
+PKG_VERSION:=5.0.18
+PKG_RELEASE:=1
+PKG_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71
 
 PKG_SOURCE_URL:=\
-	http://netmirror.org/mirror/mysql.com/Downloads/MySQL-4.0/ \
-	http://mysql.he.net/Downloads/MySQL-4.0/ \
-	http://www.linorg.usp.br/mysql/Downloads/MySQL-4.0/ \
-	http://mysql.planetmirror.com/Downloads/MySQL-4.0/ \
-	http://mysql.holywar.net/Downloads/MySQL-4.0/
+	http://mysql.planetmirror.com/Downloads/MySQL-5.0/ \
+	http://mysql.he.net/Downloads/MySQL-5.0/ \
+	http://www.linorg.usp.br/mysql/Downloads/MySQL-5.0/ \
+	http://mysql.holywar.net/Downloads/MySQL-5.0/
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_CAT:=zcat
@@ -86,13 +85,17 @@ $(PKG_BUILD_DIR)/.configured:
 $(PKG_BUILD_DIR)/.built:
 	rm -rf $(PKG_INSTALL_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+		SUBDIRS="include" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install
 	$(MAKE) -C "$(PKG_BUILD_DIR)/libmysql" \
 		CC="$(HOSTCC)" \
 		LINK="$(HOSTCC) -o conf_to_src -lc" \
 		CFLAGS="" \
 		conf_to_src
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \
-		SUBDIRS="include libmysql" \
+		SUBDIRS="libmysql" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		all install
 	$(MAKE) -C "$(PKG_BUILD_DIR)" \

openwrt/package/mysql/patches/750-mysql_config.patch

@@ -1,21 +0,0 @@
---- mysql-4.0.24/scripts/mysql_config.sh.orig	2005-03-05 01:38:14.000000000 +0100
-+++ mysql-4.0.24/scripts/mysql_config.sh	2005-05-27 06:55:46.000000000 +0200
-@@ -86,13 +86,13 @@
- 
- # Create options
- 
--libs="$ldflags -L$pkglibdir -lmysqlclient $client_libs"
-+libs="-lmysqlclient $client_libs"
- libs=`echo "$libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
--libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@"
-+libs_r="-lmysqlclient_r @LIBS@ @openssl_libs@"
- libs_r=`echo "$libs_r" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
--cflags="-I$pkgincludedir @CFLAGS@ " #note: end space!
--include="-I$pkgincludedir"
--embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @WRAPLIBS@ @innodb_system_libs@"
-+cflags=" " #note: end space!
-+include=""
-+embedded_libs="-lmysqld @LIBS@ @WRAPLIBS@ @innodb_system_libs@"
- embedded_libs=`echo "$embedded_libs" | sed -e 's;  \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'`
- 
- # Remove some options that a client doesn't have to care about