[arch-commits] Commit in mariadb/trunk (PKGBUILD)

[Bartłomiej Piotrowski]

    Date: Thursday, May 22, 2014 @ 12:04:51
  Author: bpiotrowski
Revision: 213382

upgpkg: mariadb 10.0.11-5

switch back to gcc, -fno-delete-null-pointer-checks should fix segfaults

Modified:
  mariadb/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-22 09:14:19 UTC (rev 213381)
+++ PKGBUILD	2014-05-22 10:04:51 UTC (rev 213382)
@@ -5,11 +5,11 @@
 pkgname=('libmariadbclient' 'mariadb-clients' 'mytop' 'mariadb')
 pkgver=10.0.11
 _pkgver=${pkgver/.a/a}
-pkgrel=4
+pkgrel=5
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://mariadb.org/'
-makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre' 'clang')
+makedepends=('cmake' 'openssl' 'zlib' 'libaio' 'libxml2' 'openssl' 'pcre')
 source=(https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
         mariadb.service
         mariadb-post.sh
@@ -19,19 +19,10 @@
          'b79e65a5aa536e6b5bc60988eb0b78a2'
          '2fa6e456964d4ff5e6d4f9ff0126aed6')
 
-prepare() {
-  cd $pkgbase-$_pkgver
-
-  # Fix build with ld.gold (for building with clang)
-  # https://mariadb.atlassian.net/browse/MDEV-5982
-  sed -i 's/-Wl,/&-T,/' libmysql/CMakeLists.txt
-}
-
 build() {
   mkdir build
   cd build
 
-  CC=clang CXX=clang++ \
   cmake ../$pkgbase-$_pkgver \
     -DBUILD_CONFIG=mysql_release \
     -DCMAKE_INSTALL_PREFIX=/usr \
@@ -67,11 +58,10 @@
     -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
     -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
     -DWITHOUT_TOKUDB=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" \
+    -DCMAKE_C_FLAGS="-fPIC $CFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer -fno-delete-null-pointer-checks" \
+    -DCMAKE_CXX_FLAGS="-fPIC $CXXFLAGS -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti -fno-delete-null-pointer-checks" \
     -DWITH_MYSQLD_LDFLAGS="$LDFLAGS"
 
-
   make
 }