mysql, maj 5.5.11-1

1 files changed, 101 insertions, 34 deletions

diff --git a/extra/mysql/Pkgfile b/extra/mysql/Pkgfile
index 721cc494f..8500cabcd 100644
--- a/extra/mysql/Pkgfile
+++ b/extra/mysql/Pkgfile
@@ -2,47 +2,114 @@
 # URL: http://www.mysql.com
 # Maintainer: NuTyX core team
 # Packager: thierryn1 at hispeed dot ch
-# Depends on: mysqlclient
+# Depends on: cmake, mysqlclient
 # Run on: mysqlclient
 
 name=mysql
-version=5.1.55
+version=5.5.11
+#5.1.55
 release=1
-source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.1/$name-$version.tar.gz)
+source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.5/$name-$version.tar.gz)
 
 build () {
 	source /etc/blfs-bootscripts
         wget http://www.linuxfromscratch.org/blfs/downloads/svn/$scripts-$scriptsversion.tar.bz2
         tar xvf $scripts-$scriptsversion.tar.bz2
-	cd $name-$version
-	libtoolize --force
-	aclocal
-	autoconf
-	automake
-	./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-plugins=partition,innobase,innodb_plugin \
-                --without-debug \
-                --without-readline \
-                --without-docs \
-                --without-bench 
-	make
-	make DESTDIR=$PKG install
-	rm -r $PKG/usr/{mysql-test,sql-bench}
-	for i in mysql mysql_upgrade \
-	mysqladmin mysqlbinlog \
-	mysqlcheck mysqldump mysqlimport mysqlshow \
-	mysqlslap mysqltest mysql_config
-	do rm -r $PKG/usr/bin/$i
-	done
-	rm $PKG/usr/share/mysql/charsets/README
+
+ 	cd $SRC
+        mkdir 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=/var/lib/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
+
+        make
+
+	cd $SRC/build
+  	make DESTDIR=$PKG install
+
+#  	install -Dm644 $SRC/my.cnf $PKG/etc/mysql/my.cnf
+#  	install -Dm755 $SRC/mysqld $PKG/etc/rc.d/mysqld
+
+  	# provided by libmysqlclient
+  	rm $PKG/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  	rm $PKG/usr/lib/libmysql*
+  	rm -r $PKG/usr/include/
+  	rm $PKG/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  
+  	# provided by mysql-clients
+  	rm $PKG/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  	rm $PKG/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  	# not needed
+  	rm -r $PKG/usr/{mysql-test,sql-bench}
+
+  	# These shouldn't be here
+  	rm -r $PKG/usr/docs
+  	install -d $PKG/var/lib/mysql
+  	cp -r $PKG/usr/data/* $PKG/var/lib/mysql/
+  	chmod -R 700 $PKG/var/lib/mysql
+
+#	cd $name-$version
+#	libtoolize --force
+#	aclocal
+#	autoconf
+#	automake
+#	./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-plugins=partition,innobase,innodb_plugin \
+#               --without-debug \
+#               --without-readline \
+#               --without-docs \
+#               --without-bench 
+#	make
+#	make DESTDIR=$PKG install
+#	rm -r $PKG/usr/{mysql-test,sql-bench}
+#	for i in mysql mysql_upgrade \
+#	mysqladmin mysqlbinlog \
+#	mysqlcheck mysqldump mysqlimport mysqlshow \
+#	mysqlslap mysqltest mysql_config
+#	do rm -r $PKG/usr/bin/$i
+#	done
+#	rm $PKG/usr/share/mysql/charsets/README
 	mkdir -p $PKG/etc
 	install -v -m644 $PKG/usr/share/mysql/my-medium.cnf \
 	$PKG/etc/my.cnf
@@ -50,7 +117,7 @@ build () {
 	$PKG/etc/my.cnf
 	cd ../$scripts-$scriptsversion
 	make DESTDIR=$PKG install-mysql
-	# Suppression des librairies
-	rm -r $PKG/usr/{include,lib}
+#	# Suppression des librairies
+#	rm -r $PKG/usr/{include,lib}
 }