X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=libs%2Fmysql%2FMakefile;h=1f756b99ebbbeb05ebc86ded9ea47f102796d9d5;hp=28ca8077343b08645ed9d01d40658a4c4c3a13dd;hb=361d6fc15969d88562cd4f4b1791710dfd45e3ad;hpb=384ec08bedafb22e512ec0de0ca103245010c419 diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile index 28ca807734..1f756b99eb 100644 --- a/libs/mysql/Makefile +++ b/libs/mysql/Makefile @@ -1,25 +1,30 @@ # -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/uclibc++.mk PKG_NAME:=mysql -PKG_VERSION:=5.0.18 -PKG_RELEASE:=3 +PKG_VERSION:=5.1.68 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=\ - 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_MD5SUM:=f18153b0239aaa03fc5a751f2d82cb71 + http://mysql.he.net/Downloads/MySQL-5.1/ \ + http://www.linorg.usp.br/mysql/Downloads/MySQL-5.1/ \ + http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/MySQL-5.1/ \ + http://mirror.switch.ch/ftp/mirror/mysql/Downloads/MySQL-5.1/ \ + http://downloads.mysql.com/archives/mysql-5.1/ + +PKG_MD5SUM:=3a4a627d0865ce7660504728a15b0fb9 PKG_BUILD_DEPENDS:=libncurses libreadline +PKG_BUILD_PARALLEL:=1 + PKG_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk @@ -27,107 +32,109 @@ include $(INCLUDE_DIR)/package.mk define Package/libmysqlclient/Default SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+zlib + DEPENDS:=$(CXX_DEPENDS) +zlib TITLE:=MySQL client library URL:=http://dev.mysql.com/ endef -define Package/mysql-server/Default +define Package/mysql-server SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+zlib +libmysqlclient +uclibcxx + DEPENDS:=+libmysqlclient +libpthread +libncursesw +libreadline TITLE:=MySQL Server URL:=http://dev.mysql.com/ SUBMENU:=database endef -define Package/mysql-server - $(call Package/mysql-server/Default) -endef - 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 -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)" \ - - -define Build/Configure - (cd $(PKG_BUILD_DIR); touch \ - configure.in \ - aclocal.m4 \ - Makefile.in \ - config.h.in \ - configure \ - ); - - $(call Build/Configure/Default, \ - --enable-shared \ - --enable-static \ - --enable-thread-safe-client \ - --disable-assembler \ - --with-pthread \ - --with-server \ - --without-mysqlmanager \ - --without-raid \ - --with-mysqld-user=root \ - --with-unix-socket-path=/tmp \ - --without-libwrap \ - --without-pstack \ - --with-low-memory \ - --without-embedded-server \ - --without-query-cache \ - --without-mysqlfs \ - --without-vio \ - --without-openssl \ - --without-docs \ - --without-man \ - --without-bench \ - --without-readline \ - --without-debug \ - --with-named-thread-libs=-lpthread \ - , \ - mysql_cv_compress=yes \ - mysql_cv_gethostname_style=glibc2 \ - ); -endef +TARGET_CXX=g++-uc TARGET_CFLAGS += $(FPIC) +CONFIGURE_ARGS += \ + --enable-shared \ + --enable-static \ + --enable-thread-safe-client \ + --disable-assembler \ + --with-pthread \ + --with-server \ + --without-mysqlmanager \ + --without-raid \ + --with-mysqld-user=root \ + --with-unix-socket-path=/tmp \ + --without-libwrap \ + --without-pstack \ + --with-low-memory \ + --without-embedded-server \ + --without-query-cache \ + --without-mysqlfs \ + --without-vio \ + --without-ssl \ + --without-docs \ + --without-man \ + --without-bench \ + --without-readline \ + --without-debug \ + --with-named-thread-libs=-lpthread + +CONFIGURE_VARS += \ + mysql_cv_compress=yes \ + mysql_cv_gethostname_style=glibc2 \ + mysql_cv_gcc_atomic_builtins=yes \ + mysql_cv_gcc_atomic_builtins_pthread_t=yes \ + ac_cv_c_stack_direction=-1 + define Build/Compile + +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ + SUBDIRS="include" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all $(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="" \ - CPPFLAGS="" \ + install + g++ -I $(PKG_BUILD_DIR)/include \ + -o $(PKG_BUILD_DIR)/sql/gen_lex_hash \ + $(PKG_BUILD_DIR)/sql/gen_lex_hash.cc + +$(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)" \ + SUBDIRS="libmysql" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all $(MAKE) -C "$(PKG_BUILD_DIR)" \ SUBDIRS="libmysql" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install + install + +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ + SUBDIRS="libmysql_r" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all $(MAKE) -C "$(PKG_BUILD_DIR)" \ SUBDIRS="libmysql_r" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - all install + install $(MAKE) -C "$(PKG_BUILD_DIR)" \ SUBDIRS="scripts" \ DESTDIR="$(PKG_INSTALL_DIR)" \ bin_SCRIPTS="mysql_config" \ install + +$(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + all $(MAKE) -C "$(PKG_BUILD_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ install @@ -149,7 +156,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 @@ -162,7 +169,6 @@ define Package/mysql-server/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysqladmin $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysqldump $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_install_db $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mysql_create_system_tables $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/my_print_defaults $(1)/usr/bin/ $(INSTALL_DIR) $(1)/etc/init.d/ $(INSTALL_BIN) files/mysqld.init $(1)/etc/init.d/mysqld @@ -171,8 +177,14 @@ define Package/mysql-server/install $(INSTALL_DIR) $(1)/usr/share/mysql/english $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/english/errmsg.sys $(1)/usr/share/mysql/english $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/fill_help_tables.sql $(1)/usr/share/mysql/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables.sql $(1)/usr/share/mysql/ + $(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))