qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-01 20:55:19 +02:00
Code

update mysql to 5.0 (fix #9)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2889 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2006-01-10 22:52:34 +00:00
parent 7c8d73ced4
commit 9268f753e2
3 changed files with 1678 additions and 817 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
openwrt/package/mysql/Makefile
View File

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

2453
openwrt/package/mysql/patches/500-cross-compile.patch → openwrt/package/mysql/patches/500-cross_compile.patch
View File

File diff suppressed because it is too large Load Diff

21
openwrt/package/mysql/patches/750-mysql_config.patch
View File

@ -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