Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=23e7204aa246bfcc32ec9c0b2d57acccb49f1c6d
commit 23e7204aa246bfcc32ec9c0b2d57acccb49f1c6d
Author: Elentir <elen...@frugalware.org>
Date: Wed Mar 16 15:23:15 2011 +0100
mysql-5.5.9-1-arm
* add arm to archs
* add patch to fix build on arm
diff --git a/source/apps-extra/mysql/FrugalBuild
b/source/apps-extra/mysql/FrugalBuild
index 3b6f08a..b7cf759 100644
--- a/source/apps-extra/mysql/FrugalBuild
+++ b/source/apps-extra/mysql/FrugalBuild
@@ -14,18 +14,19 @@ makedepends=('procps' 'openssl>=1.0.0' 'zlib')
_F_cmake_type=Release
Finclude cmake
groups=('apps-extra')
-archs=('i686' 'x86_64' 'ppc')
+archs=('i686' 'x86_64' 'ppc' 'arm')
up2date="lynx -dump http://dev.mysql.com/downloads/rss.php|grep -i
mysql.*server.*ga|sed 's/.* (\(.*\) GA.*/\1/'|Fsort|tail -n 1"
mirror="ftp://ftp.crysys.hu/pub/mysql/";
source=($mirror/Downloads/MySQL-5.5/$pkgname-$pkgver$extrapkgver.tar.gz \
- rc.mysqld my.cnf mysqld)
-signatures=($source.asc '' '' '')
+ rc.mysqld my.cnf mysqld \
+ fix-non-portable-code-client-plugin.patch)
+signatures=($source.asc '' '' '' '')
subpkgs=('libmysqlclient' 'libmysqld')
subdescs=('MySQL client library.' 'Embedded MySQL Server Library')
subdepends=('openssl>=1.0.0 zlib' 'libstdc++ openssl>=1.0.0 zlib')
subgroups=('lib' 'lib')
-subarchs=('i686 x86_64 ppc' 'i686 x86_64 ppc')
+subarchs=('i686 x86_64 ppc arm' 'i686 x86_64 ppc arm')
build()
{
@@ -34,7 +35,6 @@ build()
CXXFLAGS="-fPIC ${CXXFLAGS}"
fi
Fcd $pkgname-$pkgver$extrapkgver
- Fpatchall
CMake_make -DENABLED_LOCAL_INFILE=ON \
-DWITH_EMBEDDED_SERVER=ON \
-DWITH_INNOBASE_STORAGE_ENGINE=ON \
diff --git a/source/apps-extra/mysql/fix-non-portable-code-client-plugin.patch
b/source/apps-extra/mysql/fix-non-portable-code-client-plugin.patch
new file mode 100644
index 0000000..f58fbc4
--- /dev/null
+++ b/source/apps-extra/mysql/fix-non-portable-code-client-plugin.patch
@@ -0,0 +1,38 @@
+diff -Naur mysql-5.5.9/sql-common/client_plugin.c
mysql-5.5.9/sql-common/client_plugin.c
+--- mysql-5.5.9/sql-common/client_plugin.c 2011-01-19 23:37:09.000000000
+0100
++++ mysql-5.5.9/sql-common/client_plugin.c 2011-03-16 15:10:21.076223240
+0100
+@@ -227,6 +227,7 @@
+ {
+ MYSQL mysql;
+ struct st_mysql_client_plugin **builtin;
++ va_list unused;
+
+ if (initialized)
+ return 0;
+@@ -243,7 +244,7 @@
+ pthread_mutex_lock(&LOCK_load_client_plugin);
+
+ for (builtin= mysql_client_builtins; *builtin; builtin++)
+- add_plugin(&mysql, *builtin, 0, 0, 0);
++ add_plugin(&mysql, *builtin, 0, 0, unused);
+
+ pthread_mutex_unlock(&LOCK_load_client_plugin);
+
+@@ -287,6 +288,8 @@
+ mysql_client_register_plugin(MYSQL *mysql,
+ struct st_mysql_client_plugin *plugin)
+ {
++ va_list unused;
++
+ if (is_not_initialized(mysql, plugin->name))
+ return NULL;
+
+@@ -301,7 +304,7 @@
+ plugin= NULL;
+ }
+ else
+- plugin= add_plugin(mysql, plugin, 0, 0, 0);
++ plugin= add_plugin(mysql, plugin, 0, 0, unused);
+
+ pthread_mutex_unlock(&LOCK_load_client_plugin);
+ return plugin;
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
