[Devil-linux-commit] build/scripts cmake,NONE,1.1 mysql,1.32,1.33

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv3969/scripts

Modified Files:
	mysql 
Added Files:
	cmake 
Log Message:
- updated bacula to 5.2.5
- updated cmake to 2.8.7
- updated dovecot to 2.0.17
- updated httpd to 2.2.22
- updated mysql to 5.5.20
- updated php to 5.3.10
- updated postfix to 2.8.7
- added cmake 2.8.7


--- NEW FILE: cmake ---
#!/bin/bash
# $Source: /cvsroot/devil-linux/build/scripts/cmake,v $
# $Revision: 1.1 $
# $Date: 2012/02/05 18:41:00 $
#
# http://www.devil-linux.org

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings

case $1 in
	build )
		./bootstrap --prefix=/usr --parallel=${CONFIG_PMAKE} || exit 1
		make $PMAKE || exit 1
		make install || exit 1
		;;


	* )
		echo "ERROR ($0)"
		echo "please add parameter so I know what to do"
		exit 1
		;;
esac

Index: mysql
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/mysql,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- mysql	5 Dec 2011 09:11:38 -0000	1.32
+++ mysql	5 Feb 2012 18:41:00 -0000	1.33
@@ -21,17 +21,19 @@
 	if [ "$CONFIG_MYSQL_CLIENT" = "y" ]; then
 		FLAGS=""
 		if [ ! "$CONFIG_MYSQL_SERVER" = "y" ]; then
-			FLAGS="--without-server"
+			FLAGS="-DWITHOUT_SERVER=ON"
 		fi
 
-		echo '/* Linuxthreads */' >> /usr/include/pthread.h
-		./configure --prefix=/usr --without-bench --without-docs --without-debug --enable-thread-safe-client \
-		    --libdir=/usr/lib --with-ssl --with-mysqlfs --sysconfdir=/etc --localstatedir=/var --with-pthread \
-		    --with-named-thread-lib=-lpthread  || exit 1
+		cmake -DMYSQL_DATADIR=/var/mysql -DWITH_ARCHIVE_STORAGE_ENGINE=ON -DWITH_BLACKHOLE_STORAGE_ENGINE=ON \
+			-DWITH_INNOBASE_STORAGE_ENGINE=ON -DWITH_PARTITION_STORAGE_ENGINE=ON -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \
+			-DWITH_FEDERATED_STORAGE_ENGINE=ON -DWITH_PARTITION_STORAGE_ENGINE=ON -DWITH_PERFSCHEMA_STORAGE_ENGINE=ON \
+			-DWITH_READLINE=OFF -DINSTALL_LAYOUT=RPM -DSYSCONFDIR=/etc -DENABLE_DEBUG_SYNC=OFF -DWITH_SSL=yes -DWITH_PIC=ON \
+			-DWITH_UNIT_TESTS=OFF -DCMAKE_INSTALL_PREFIX=/usr ${FLAGS} || exit 1
 		make $PMAKE all || exit 1
 
 		# install it, so other program can make use of it
-		make install pkglibdir=/usr/lib
+		make install 
+		cp /usr/share/mysql/my-small.cnf /etc/my.cnf || exit 1
 	fi
         ;;
 
@@ -39,10 +41,10 @@
 	if [ "$CONFIG_MYSQL_CLIENT" = "y" ]; then
 		rm -rf $TMPDIR || exit 1
 		mkdir -p $TMPDIR || exit 1
-		make install DESTDIR=$TMPDIR pkglibdir=/usr/lib || exit 1
+		make install DESTDIR=$TMPDIR || exit 1
 		rm -rf $TMPDIR/usr/include || exit 1
+		test -d $TMPDIR/usr/lib64 && mv $TMPDIR/usr/lib64 $TMPDIR/usr/lib
 		rm $TMPDIR/usr/lib/*.a || exit 1
-		rm $TMPDIR/usr/lib/*.la || exit 1
 		copy_docs $TMPDIR
 		rm -rf $TMPDIR/usr/mysql-test || exit 1
 		# cp $TMPDIR/usr/share/mysql/my-small.cnf $ETCDIR/etc/my.cnf || exit 1