[arch-commits] Commit in mysql/trunk (PKGBUILD mysql-no-clients.patch)
Douglas Soares de Andrade
douglas at archlinux.org
Tue Mar 24 09:27:15 UTC 2009
Date: Tuesday, March 24, 2009 @ 05:27:15
Author: douglas
Revision: 31074
upgpkg: mysql 5.1.32-1
Modified:
mysql/trunk/PKGBUILD
mysql/trunk/mysql-no-clients.patch
------------------------+
PKGBUILD | 53 +++++++++++++++++---------------
mysql-no-clients.patch | 76 ++++++++---------------------------------------
2 files changed, 43 insertions(+), 86 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-24 09:17:23 UTC (rev 31073)
+++ PKGBUILD 2009-03-24 09:27:15 UTC (rev 31074)
@@ -3,60 +3,65 @@
# Contributor: judd <jvinet at zeroflux.org>
pkgname=mysql
-pkgver=5.0.77
-pkgrel=3
+pkgver=5.1.32
+pkgrel=1
pkgdesc="A fast SQL database server"
arch=(i686 x86_64)
backup=(etc/my.cnf etc/conf.d/mysqld)
-depends=("mysql-clients>=${pkgver}" 'tcp_wrappers')
+depends=("mysql-clients>=${pkgver}" 'tcp_wrappers' 'zlib' 'perl')
makedepends=('libtool' 'patch')
url=('http://www.mysql.com/')
options=('!libtool')
optdepends=('perl-dbi' 'perl-dbd-mysql')
license=('GPL')
-source=(ftp://ftp.pucpr.br/mysql/Downloads/MySQL-5.0/mysql-${pkgver}.tar.gz
+source=(ftp://ftp.pucpr.br/mysql/Downloads/MySQL-5.1/mysql-${pkgver}.tar.gz
mysql-no-clients.patch
+ mysql-fix-libs.patch
mysqld
my.cnf
mysqld.conf.d)
build() {
- # PIC
cd ${startdir}/src/${pkgname}-${pkgver}
patch -Np1 -i ${startdir}/src/mysql-no-clients.patch || return 1
+ patch -Np1 -i ${startdir}/src/mysql-fix-libs.patch || return 1
./configure --prefix=/usr --libexecdir=/usr/sbin \
- --without-debug --without-docs --without-bench --without-readline \
- --with-innodb --enable-local-infile --with-openssl \
- --with-charset=latin1 --with-collation=latin1_general_ci \
- --with-extra-charsets=complex --enable-thread-safe-client \
- --with-libwrap --with-berkeley-db --with-embedded-server
+ --localstatedir=/var --sysconfdir=/etc \
+ --without-debug --without-docs --without-readline \
+ --enable-local-infile --with-ssl \
+ --with-charset=latin1 --with-collation=latin1_general_ci \
+ --with-extra-charsets=complex --enable-thread-safe-client \
+ --with-libwrap
- # fixes
- sed -i -e 's/^.*HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE.*$/#define\ HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE/g' include/config.h || return 1
- sed -i -e 's/size_socket/socklen_t/g' sql/mysqld.cc || return 1
-
pushd include || return
make || return 1
popd
- pushd libmysql
- make link_sources get_password.lo || return
+
+ pushd libmysql
+ make link_sources get_password.lo || return
popd
+
+ pushd storage || return
make || return 1
+ popd
+
+ # fixes
+ #sed -i -e 's/^.*HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE.*$/#define\ HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE/g' include/config.h || return 1
+ #sed -i -e 's/size_socket/socklen_t/g' sql/mysqld.cc || return 1
+
+ make || return 1
make DESTDIR=${startdir}/pkg install
- rm -rf ${startdir}/pkg/usr/{mysql-test,sql-bench}
+
+ rm -rf $pkgdir/usr/{mysql-test,sql-bench,lib,include}
install -D -m644 ../my.cnf ${startdir}/pkg/etc/my.cnf
install -D -m755 ../mysqld ${startdir}/pkg/etc/rc.d/mysqld
install -D -m644 ../mysqld.conf.d ${startdir}/pkg/etc/conf.d/mysqld
rm -f ${startdir}/pkg/usr/bin/mysql_config
}
-md5sums=('6c30a20c9059daf053a301e927eb1667'
- 'c227818b5157bf2bdb4dd4bd549f2df8'
+md5sums=('f2d14b5e3b9d50b809c9b9985e4513b7'
+ 'b4c9effb2ebf85a6aae9e94f5bbef344'
+ 'd1921e85821a66196c24ef6e5346b572'
'247e9fa664bccaca62ca0e42a6cfae20'
'0ee035590ffc61d32de994f461fd2bd2'
'4a9077fc95ec6db1d5420e0cdc74d31c')
-md5sums=('6c30a20c9059daf053a301e927eb1667'
- 'c227818b5157bf2bdb4dd4bd549f2df8'
- '247e9fa664bccaca62ca0e42a6cfae20'
- '0ee035590ffc61d32de994f461fd2bd2'
- '4a9077fc95ec6db1d5420e0cdc74d31c')
Modified: mysql-no-clients.patch
===================================================================
--- mysql-no-clients.patch 2009-03-24 09:17:23 UTC (rev 31073)
+++ mysql-no-clients.patch 2009-03-24 09:27:15 UTC (rev 31074)
@@ -1,64 +1,16 @@
-diff -ruN mysql-5.0.51.orig/Makefile.in mysql-5.0.51/Makefile.in
---- mysql-5.0.51.orig/Makefile.in 2007-12-07 12:59:21.000000000 +0000
-+++ mysql-5.0.51/Makefile.in 2007-12-07 13:03:21.000000000 +0000
-@@ -376,7 +376,7 @@
- SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \
+diff -Naur mysql-5.1.32/Makefile.in mysql-5.1.32-novo/Makefile.in
+--- mysql-5.1.32/Makefile.in 2009-02-13 23:03:22.000000000 -0200
++++ mysql-5.1.32-novo/Makefile.in 2009-03-24 04:48:19.000000000 -0300
+@@ -396,8 +396,9 @@
+ SUBDIRS = . include @docs_dirs@ @zlib_dir@ \
@readline_topdir@ sql-common scripts \
- @thread_dirs@ pstack \
-- @sql_union_dirs@ @man_dirs@ tests \
-+ strings mysys dbug extra regex bdb innobase myisam myisammrg heap vio sql @man_dirs@ tests \
+ @pstack_dir@ \
+- @sql_union_dirs@ unittest storage plugin \
+- @sql_server@ @man_dirs@ tests \
++ strings mysys dbug extra regex vio \
++ sql unittest storage plugin \
++ @sql_server@ \
netware @libmysqld_dirs@ \
- @bench_dirs@ support-files @tools_dirs@
-
-diff -ruN mysql-5.0.51.orig/include/Makefile.in mysql-5.0.51/include/Makefile.in
---- mysql-5.0.51.orig/include/Makefile.in 2007-12-07 12:59:20.000000000 +0000
-+++ mysql-5.0.51/include/Makefile.in 2007-12-07 13:00:12.000000000 +0000
-@@ -557,7 +557,6 @@
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
- done
- install: $(BUILT_SOURCES)
-- $(MAKE) $(AM_MAKEFLAGS) install-am
- install-exec: install-exec-am
- install-data: install-data-am
- uninstall: uninstall-am
-diff -ruN mysql-5.0.51.orig/tools/Makefile.in mysql-5.0.51/tools/Makefile.in
---- mysql-5.0.51.orig/tools/Makefile.in 2007-12-07 12:59:19.000000000 +0000
-+++ mysql-5.0.51/tools/Makefile.in 2007-12-07 13:02:32.000000000 +0000
-@@ -369,7 +369,7 @@
- $(openssl_includes)
-
- LDADD = @CLIENT_EXTRA_LDFLAGS@ \
-- $(top_builddir)/libmysql_r/libmysqlclient_r.la \
-+ /usr/lib/mysql/libmysqlclient_r.so \
- @openssl_libs@ @yassl_libs@ @ZLIB_LIBS@
-
- mysqltestmanager_SOURCES = mysqlmanager.c
---- mysql-5.0.51.orig/tests/Makefile.in.old 2009-02-24 15:39:22.000000000 -0300
-+++ mysql-5.0.51.orig/tests/Makefile.in 2009-02-24 15:40:32.000000000 -0300
-@@ -92,7 +92,7 @@
- am_mysql_client_test_OBJECTS = mysql_client_test.$(OBJEXT) \
- my_memmem.$(OBJEXT)
- mysql_client_test_OBJECTS = $(am_mysql_client_test_OBJECTS)
--am__DEPENDENCIES_1 = $(top_builddir)/libmysql/libmysqlclient.la
-+am__DEPENDENCIES_1 = /usr/lib/mysql/libmysqlclient.so
- am__DEPENDENCIES_2 =
- mysql_client_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_2)
-@@ -102,7 +102,7 @@
- thread_test_SOURCES = thread_test.c
- thread_test_OBJECTS = thread_test.$(OBJEXT)
- thread_test_LDADD = $(LDADD)
--thread_test_DEPENDENCIES = $(top_builddir)/libmysql/libmysqlclient.la
-+thread_test_DEPENDENCIES = /usr/lib/mysql/libmysqlclient.so
- DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)/include
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -398,7 +398,7 @@
- $(openssl_includes)
-
- LDADD = @CLIENT_EXTRA_LDFLAGS@ \
-- $(top_builddir)/libmysql/libmysqlclient.la
-+ /usr/lib/mysql/libmysqlclient.so
-
- mysql_client_test_LDADD = $(LDADD) $(CXXLDFLAGS)
- mysql_client_test_SOURCES = mysql_client_test.c\
+ mysql-test support-files sql-bench @tools_dirs@ \
+ win
+
More information about the arch-commits
mailing list