-Completed transition to new ipkg method (ipkg.def), but still problem with eglibc...

[hvlinux.git] / stage3 / cis-mysql

diff --git a/stage3/cis-mysql b/stage3/cis-mysql
index 2cc93ce..08d9f88 100755 (executable)
--- a/stage3/cis-mysql
+++ b/stage3/cis-mysql
@@ -11,11 +11,11 @@ source ../packages-list
 # Applying patches (if any)
 apply_patches ${1}
 
-hv_groupadd mysql
+groupadd -f mysql
 hv_useradd -c mysql -d /dev/null -g mysql -s /bin/false mysql
 
 cd ${LFS_TMP}/${1}
-CPPFLAGS="-D_GNU_SOURCE" ./configure \
+./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/sbin \
@@ -23,18 +23,21 @@ CPPFLAGS="-D_GNU_SOURCE" ./configure \
     --enable-thread-safe-client \
     --enable-assembler \
     --enable-local-infile \
-    --with-named-thread-libs=-lpthread \
     --with-unix-socket-path=/var/run/mysql/mysql.sock \
     --without-debug \
-    --without-bench \
-    --without-readline
-make testdir=/usr/lib/mysql/mysql-test
-make testdir=/usr/lib/mysql/mysql-test install
+    --without-readline \
+    --with-plugins=innobase,myisam \
+    --with-extra-charsets=all \
+    --with-ssl
+make
+make benchdir_root=/tmp/mysql-bench install
+rm -rf /tmp/mysql
 cd /usr/lib
-ln -sf mysql/libmysqlclient{,_r}.so* .
+ln -v -sf mysql/libmysqlclient{,_r}.so* .
 
 # Copying default configuration file.
-cp /usr/share/mysql/my-medium.cnf /etc/my.cnf
+install -v -m644 /usr/share/mysql/my-medium.cnf /etc/my.cnf
+sed -i -e s/^skip-federated/#skip-federated/ /etc/my.cnf
 
 mysql_install_db --user=mysql
 chgrp mysql /srv/mysql{,/test,/mysql}