summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/libmysql/.md5sum.i6862
-rw-r--r--base/libmysql/.md5sum.x86_642
-rw-r--r--base/libmysql/Pkgfile125
3 files changed, 43 insertions, 86 deletions
diff --git a/base/libmysql/.md5sum.i686 b/base/libmysql/.md5sum.i686
index 7456d6e8f..12fbbaa80 100644
--- a/base/libmysql/.md5sum.i686
+++ b/base/libmysql/.md5sum.i686
@@ -1 +1 @@
-19f43bb9c72b1b5f7ff86a7f921c9244 mysql-5.5.14.tar.gz
+306b5549c7bd72e8e705a890db0da82b mysql-5.5.15.tar.gz
diff --git a/base/libmysql/.md5sum.x86_64 b/base/libmysql/.md5sum.x86_64
index 7456d6e8f..12fbbaa80 100644
--- a/base/libmysql/.md5sum.x86_64
+++ b/base/libmysql/.md5sum.x86_64
@@ -1 +1 @@
-19f43bb9c72b1b5f7ff86a7f921c9244 mysql-5.5.14.tar.gz
+306b5549c7bd72e8e705a890db0da82b mysql-5.5.15.tar.gz
diff --git a/base/libmysql/Pkgfile b/base/libmysql/Pkgfile
index b07f7ec34..d3c4cfbd8 100644
--- a/base/libmysql/Pkgfile
+++ b/base/libmysql/Pkgfile
@@ -5,104 +5,61 @@
# Depends on : cmake
name=libmysql
-version=5.5.14
+version=5.5.15
release=1
source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-${version%.*}/mysql-$version.tar.gz )
build () {
cd $SRC
mkdir build
- cd build
+ cd build
CFLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer"
CXXFLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti"
-
+
cmake ../mysql-$version \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMYSQL_DATADIR=/srv/mysql \
- -DSYSCONFDIR=/etc/mysql \
- -DINSTALL_INFODIR=share/mysql/docs \
- -DINSTALL_MANDIR=share/man \
- -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
- -DINSTALL_SCRIPTDIR=bin \
- -DINSTALL_INCLUDEDIR=include/mysql \
- -DINSTALL_DOCREADMEDIR=share/mysql \
- -DINSTALL_SUPPORTFILESDIR=share/mysql \
- -DINSTALL_MYSQLSHAREDIR=share/mysql \
- -DINSTALL_SHAREDIR=share/mysql \
- -DWITH_READLINE=ON \
- -DWITH_ZLIB=system \
- -DWITH_SSL=system \
- -DWITH_LIBWRAP=ON \
- -DDEFAULT_CHARSET=utf8 \
- -DDEFAULT_COLLATION=utf8_general_ci \
- -DWITH_EXTRA_CHARSETS=complex \
- -DWITH_EMBEDDED_SERVER=ON \
- -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
- -DENABLED_LOCAL_INFILE=ON \
- -DWITH_PARTITION_STORAGE_ENGINE=1 \
- -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
- -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
- -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
- -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
- -DWITH_INNOBASE_STORAGE_ENGINE=1
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONFDIR=/etc/mysql \
+ -DMYSQL_DATADIR=/srv/mysql \
+ -DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
+ -DINSTALL_INFODIR=share/mysql/docs \
+ -DINSTALL_MANDIR=share/man \
+ -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_INCLUDEDIR=include/mysql \
+ -DINSTALL_DOCREADMEDIR=share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_SHAREDIR=share/mysql \
+ -DDEFAULT_CHARSET=utf8 \
+ -DDEFAULT_COLLATION=utf8_general_ci \
+ -DENABLED_LOCAL_INFILE=ON \
+ -DWITH_READLINE=ON \
+ -DWITH_ZLIB=system \
+ -DWITH_SSL=system \
+ -DWITH_LIBWRAP=ON \
+ -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}" \
+ -DWITH_EXTRA_CHARSETS=complex \
+ -DWITH_EMBEDDED_SERVER=ON \
+ -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+ -DWITH_PARTITION_STORAGE_ENGINE=1 \
+ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \
+ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \
+ -DWITHOUT_FEDERATED_STORAGE_ENGINE=1
make
cd $SRC/build
- for dir in include libmysql libmysqld libservices; do
- make -C ${dir} DESTDIR=$PKG install
- done
+ for dir in include libmysql libmysqld libservices; do
+ make -C $dir DESTDIR=$PKG install
+ done
install -d $PKG/usr/bin
- install -m755 scripts/mysql_config $PKG/usr/bin/
- install -d $PKG/usr/share/man/man1
- for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
- install -m644 $SRC/mysql-$version/man/$man.1 $PKG/usr/share/man/man1/$man.1
- done
-
-# cd mysql-$version
-# ./configure --prefix=/usr \
-# --sysconfdir=/etc \
-# --libexecdir=/usr/sbin \
-# --localstatedir=/srv/mysql \
-# --enable-assembler \
-# --enable-thread-safe-client \
-# --enable-local-infile \
-# --with-unix-socket-path=/var/run/mysql/mysql.sock \
-# --with-extra-charsets=all \
-# --with-berkeley-db \
-# --without-debug \
-# --without-readline \
-# --without-docs \
-# --without-bench
-#
-# cd $SRC/build
-# for dir in include strings \
-# mysys dbug storage regex extra vio sql; do
-# pushd $dir
-# make -j2
-# popd
-# done
-# for dir in libmysql libmysql_r libmysqld; do
-# pushd $dir
-# make link_sources
-# make -j2
-# make DESTDIR=$PKG install
-# popd
-# done
-# cd include
-# make DESTDIR=$PKG install
-# install -m644 *.h $PKG/usr/include/mysql
-# cd ../scripts
-# make mysql_config
-# install -D -m755 mysql_config $PKG/usr/bin/mysql_config
-#
-# ln -sf mysql/libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so.16
-# ln -sf libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so
-# ln -sf libmysqlclient.so.16 $PKG/usr/lib/libmysqlclient.so.1
-# ln -sf mysql/libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so.16
-# ln -sf libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so
-# ln -sf libmysqlclient_r.so.16 $PKG/usr/lib/libmysqlclient_r.so.1
+ install -m755 scripts/mysql_config $PKG/usr/bin/
+ install -d $PKG/usr/share/man/man1
+ for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+ install -m644 $SRC/mysql-$version/man/$man.1 $PKG/usr/share/man/man1/$man.1
+ done
}