fix segfault in locking utility

[openwrt.git] / openwrt / package / mysql / Makefile

diff --git a/openwrt/package/mysql/Makefile b/openwrt/package/mysql/Makefile
index b0af5d7..ad6b529 100644 (file)
--- a/openwrt/package/mysql/Makefile
+++ b/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)" \
@@ -104,17 +107,17 @@ $(PKG_BUILD_DIR)/.built:
 
 $(IPKG_LIBMYSQLCLIENT):
        install -d -m0755 $(IDIR_LIBMYSQLCLIENT)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/
        $(RSTRIP) $(IDIR_LIBMYSQLCLIENT)
        $(IPKG_BUILD) $(IDIR_LIBMYSQLCLIENT) $(PACKAGE_DIR)
 
 $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/usr/bin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/mysql_config $(STAGING_DIR)/usr/bin/
        mkdir -p $(STAGING_DIR)/usr/include
-       cp -fpR $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/mysql $(STAGING_DIR)/usr/include/
        mkdir -p $(STAGING_DIR)/usr/lib
-       cp -fpR $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql $(STAGING_DIR)/usr/lib/
        rm -f $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la
        touch $@
 
@@ -126,5 +129,5 @@ uninstall-dev:
          $(STAGING_DIR)/usr/include/mysql \
          $(STAGING_DIR)/usr/lib/mysql \
 
-compile: install-dev
-clean: uninstall-dev
+compile-targets: install-dev
+clean-targets: uninstall-dev