[packages] mysql: ensure linking against libuClibc++, also install system table data...
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 27 Jan 2011 22:29:00 +0000 (22:29 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 27 Jan 2011 22:29:00 +0000 (22:29 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/packages@25181 3c298f89-4303-0410-b956-a3cf2f4a3e73

libs/mysql/Makefile

index 720609d..9f0d392 100644 (file)
@@ -56,6 +56,8 @@ define Package/libmysqlclient_r
   TITLE += threadsafe
 endef
 
+TARGET_CXX=g++-uc
+
 CONFIGURE_VARS += \
         CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++"  \
         CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \
@@ -190,6 +192,7 @@ define Package/mysql-server/install
        $(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
 
 $(eval $(call BuildPackage,mysql-server))