diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-10 18:23:51 -0300 |
commit | 38b5b952ddc3b86560fc02e98105bf5826d25354 (patch) | |
tree | 0e689740cb7cc4cf171a6c962e623dbe7e53fc64 /extra/mysql | |
parent | 1146fc0894bfda25180d63716029aabfa7ce017a (diff) | |
parent | 0615a909b089a81d068ae10517ceff31dabfece1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/performous/PKGBUILD
community-testing/oss/PKGBUILD
community-testing/picard/PKGBUILD
community/deadbeef/PKGBUILD
community/gnash/PKGBUILD
community/mplayer2/PKGBUILD
community/radvd/PKGBUILD
community/tinc/PKGBUILD
core/glibc/PKGBUILD
core/lvm2/PKGBUILD
core/util-linux/PKGBUILD
extra/avidemux/PKGBUILD
extra/boost/PKGBUILD
extra/cppunit/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/gstreamer0.10-ugly/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/kradio/PKGBUILD
extra/opal/PKGBUILD
extra/pidgin/PKGBUILD
extra/postfix/PKGBUILD
extra/ptlib/PKGBUILD
extra/xine-lib/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kdm.service
kde-unstable/kdemultimedia-ffmpegthumbs/PKGBUILD
libre/virtualbox-libre/PKGBUILD
libre/virtualbox-modules-lts/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-libjpeg-turbo/PKGBUILD
multilib/lib32-pixman/PKGBUILD
staging/ekiga/PKGBUILD
staging/kdeedu-kig/PKGBUILD
staging/kdeedu-rocs/PKGBUILD
testing/glibc/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdebase-workspace/kdm.service
testing/nilfs-utils/PKGBUILD
testing/systemd/PKGBUILD
Diffstat (limited to 'extra/mysql')
-rw-r--r-- | extra/mysql/PKGBUILD | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index ea50b63c4..1ced35609 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,21 +1,22 @@ -# $Id: PKGBUILD 161633 2012-06-12 18:06:14Z andrea $ +# $Id: PKGBUILD 163038 2012-07-06 07:38:34Z andrea $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.25 +pkgver=5.5.25.a +_pkgver=5.5.25a pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="https://www.mysql.com/products/community/" makedepends=('cmake' 'openssl' 'zlib') options=('!libtool') -source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" +source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${_pkgver}.tar.gz" 'mysqld' 'my.cnf') -md5sums=('9e2a3d5b41eac7fae41b93e5b71ea49c' +md5sums=('0841fbc79872c5f467d8c8842f45257a' '2234207625baa29b2ff7d7b4f088abce' '1c949c0dbea5206af0db14942d9927b6') @@ -25,10 +26,8 @@ build() { cd build # CFLAGS/CXXFLAGS as suggested upstream - 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 ../${pkgbase}-${pkgver} \ + cmake ../${pkgbase}-${_pkgver} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DSYSCONFDIR=/etc/mysql \ @@ -59,7 +58,9 @@ build() { -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_ARCHIVE_STORAGE_ENGINE=1 \ -DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1 \ - -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 + -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \ + -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \ + -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" make } @@ -77,7 +78,7 @@ package_libmysqlclient(){ install -m755 scripts/mysql_config "${pkgdir}"/usr/bin/ install -d "${pkgdir}"/usr/share/man/man1 for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done } @@ -91,7 +92,7 @@ package_mysql-clients(){ # install man pages install -d "${pkgdir}"/usr/share/man/man1 for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do - install -m644 "${srcdir}"/${pkgbase}-${pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 + install -m644 "${srcdir}"/${pkgbase}-${_pkgver}/man/$man.1 "${pkgdir}"/usr/share/man/man1/$man.1 done # provided by mysql |