X-Git-Url: http://gitweb/?a=blobdiff_plain;f=mysql%2FPkgfile;h=5b34a9bf3c001af793f30dc06c2d160c10e78634;hb=199f2d02e83263076bcf3cca183c01556e22b596;hp=773de87c268b46a2a240c443382c7f5c8544d96e;hpb=6badf10206c3f35930935dc79490ed0c5d62c706;p=ports%2Fopt-arm.git

diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index 773de87..5b34a9b 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -5,15 +5,20 @@
 # Depends on: tcp_wrappers ncurses zlib openssl cmake libaio
 
 name=mysql
-version=5.5.29
+version=5.6.24
 release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz \
-        my.cnf mysqld $name-${version}_valist.patch)
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.gz \
+        my.cnf mysqld valist.patch)
 
 build () {
-    cd $name-$version
-    patch -p1 -i $SRC/$name-${version}_valist.patch
-    cmake . \
+  cd $name-$version
+
+  patch -p1 -i $SRC/valist.patch
+  
+  # fix for openssl 1.0.2
+  sed -i 's/REGEX "^#define/REGEX "^# *define/' cmake/ssl.cmake
+
+  cmake . \
         -DBUILD_CONFIG=mysql_release \
         -DINSTALL_LAYOUT=RPM \
         -DCMAKE_INSTALL_PREFIX=/usr \
@@ -25,17 +30,17 @@ build () {
         -DWITH_SSL=system \
         -DWITH_ZLIB=system
 
-    make
-    make DESTDIR=$PKG install
+  make
+  make DESTDIR=$PKG install
 
-    rm -r $PKG/usr/share/{mysql-test,info}
-    rm $PKG/usr/share/mysql/charsets/README
-    find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \;
+  rm -r $PKG/usr/share/{mysql-test,info}
+  rm $PKG/usr/share/mysql/charsets/README
+  find $PKG/usr/share/mysql/* -type d ! -name english ! -name charsets | xargs rm -rf {} \;
 
-    install -d  $PKG/var/{lib,log}
-    touch mysqld.log
-    install -m 600 -o mysql -g mysql mysqld.log $PKG/var/log
-    install -d -m 700 -o mysql -g mysql $PKG/var/lib/mysql
-    install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld
-    install -m 600 $SRC/my.cnf $PKG/etc
+  install -d  $PKG/var/{lib,log}
+  touch mysqld.log
+  install -m 600 -o mysql -g mysql mysqld.log $PKG/var/log
+  install -d -m 700 -o mysql -g mysql $PKG/var/lib/mysql
+  install -D -m 755 $SRC/mysqld $PKG/etc/rc.d/mysqld
+  install -m 600 $SRC/my.cnf $PKG/etc
 }