[packages] licensing: Licensing metadata added to many packages

[openwrt/svn-archive/archive.git] / libs / mysql / Makefile

diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile
index ed1f1c606564d88dfe5065d15ea703d54b0d7bff..06c2bafa5c4de8fa330423d9c4cf7dee4d70330b 100644 (file)
--- a/libs/mysql/Makefile
+++ b/libs/mysql/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mysql
 PKG_VERSION:=5.1.53
-PKG_RELEASE:=4
+PKG_RELEASE:=7
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=\
@@ -37,7 +37,7 @@ endef
 define Package/mysql-server/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  DEPENDS:=+libmysqlclient
+  DEPENDS:=+libmysqlclient +libpthread +libncursesw +libreadline
   TITLE:=MySQL Server
   URL:=http://dev.mysql.com/
   SUBMENU:=database
@@ -51,9 +51,10 @@ define Package/libmysqlclient
   $(call Package/libmysqlclient/Default)
 endef
 
-define Package/libmysqlclient_r
+define Package/libmysqlclient-r
   $(call Package/libmysqlclient/Default)
   TITLE += threadsafe
+  DEPENDS+= +libpthread
 endef
 
 TARGET_CXX=g++-uc
@@ -62,8 +63,8 @@ CONFIGURE_VARS += \
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
         CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
         LDFLAGS="$$$$LDFLAGS" \
-        LIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S)" \
-        CLIENTCLIBS="-nodefaultlibs -luClibc++ -lm $(LIBGCC_S)" \
+        LIBS="-nodefaultlibs -luClibc++ -lm -lc $(LIBGCC_S)" \
+        CLIENTCLIBS="-nodefaultlibs -luClibc++ -lm -lc $(LIBGCC_S)" \
 
 
 define Build/Configure
@@ -111,7 +112,7 @@ endef
 TARGET_CFLAGS += $(FPIC)
 
 define Build/Compile
-       $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+       +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
                SUBDIRS="include" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all
@@ -119,13 +120,13 @@ define Build/Compile
                SUBDIRS="include" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install
-       $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
+       +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)/libmysql" \
                CC="g++" \
                CFLAGS="$(HOST_CFLAGS)" \
                CPPFLAGS="$(HOST_CFLAGS)" \
                LDFLAGS="$(HOST_LDFLAGS)" \
                conf_to_src
-       $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+       +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
                SUBDIRS="libmysql" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all
@@ -133,7 +134,7 @@ define Build/Compile
                SUBDIRS="libmysql" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                install
-       $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+       +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
                SUBDIRS="libmysql_r" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all
@@ -146,7 +147,7 @@ define Build/Compile
                DESTDIR="$(PKG_INSTALL_DIR)" \
                bin_SCRIPTS="mysql_config" \
                install
-       $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
+       +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all
        $(MAKE) -C "$(PKG_BUILD_DIR)" \
@@ -170,7 +171,7 @@ define Package/libmysqlclient/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient.so.* $(1)/usr/lib/
 endef
-define Package/libmysqlclient_r/install
+define Package/libmysqlclient-r/install
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/mysql/libmysqlclient_r.so.* $(1)/usr/lib/
 endef
@@ -195,6 +196,10 @@ define Package/mysql-server/install
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables_data.sql $(1)/usr/share/mysql/
 endef
 
+define Package/mysql-server/conffiles
+/etc/my.cnf
+endef
+
 $(eval $(call BuildPackage,mysql-server))
 $(eval $(call BuildPackage,libmysqlclient))
-$(eval $(call BuildPackage,libmysqlclient_r))
+$(eval $(call BuildPackage,libmysqlclient-r))