[Lunar-commits] <moonbase> mysql: Bump to 5.1.44, refactored the module a bit

Stefan Wold ratler at lunar-linux.org
Fri Feb 26 12:18:51 CET 2010


commit 061814a47ed8c1197c6613b76c760daeba905b20
Author: Stefan Wold <ratler at lunar-linux.org>
Date:   Thu Feb 25 23:07:31 2010 +0100

    mysql: Bump to 5.1.44, refactored the module a bit
---
 sql/mysql/BUILD     |   73 ++++++++++++++++++++++++++++++--------------------
 sql/mysql/CONFIGURE |   67 +++-------------------------------------------
 sql/mysql/DEPENDS   |    5 +++
 sql/mysql/DETAILS   |   14 +++++-----
 4 files changed, 61 insertions(+), 98 deletions(-)

diff --git a/sql/mysql/BUILD b/sql/mysql/BUILD
index a9bd692..1308b8b 100644
--- a/sql/mysql/BUILD
+++ b/sql/mysql/BUILD
@@ -1,36 +1,51 @@
 (
+  MYSQL_PLUGINS="heap federated partition archive blackhole"
+  PLUG="innobase,ndbcluster"
+  for mp in $MYSQL_PLUGINS; do
+    if [ $(eval echo \$USE_$mp) == "y" ]; then
+      PLUG="$PLUG,$mp"
+    fi
+  done &&
+
+  OPTS+=" --with-plugins=${PLUG}" &&
 
   add_priv_user mysql:mysql  &&
   devoke_installwatch        &&
 
   if [ "`arch`" == "alpha" ]; then
-          export CFLAGS="$CFLAGS -fPIC"
-        export CXXFLAGS="$CXXFLAGS -fPIC"
-  fi &&
+      export CFLAGS="$CFLAGS -fPIC"
+      export CXXFLAGS="$CXXFLAGS -fPIC"
+  fi  &&
 
   if [ "`arch`" == "x86_64" ]; then
-         export CFLAGS="$CFLAGS -fPIC"
-       export CXXFLAGS="$CXXFLAGS -fPIC"
-  fi &&
-
-  export CXX='gcc' &&
-
-  ./configure  --prefix=/usr                   \
-               --disable-dependency-tracking   \
-               --without-bench                 \
-               --without-debug                 \
-               --without-readline              \
-               --without-libedit               \
-               --enable-thread-safe-client     \
-               --enable-assembler              \
-               --localstatedir=/var/lib/mysql  \
-               --infodir=/usr/share/info       \
-               --mandir=/usr/share/man         \
-               --with-pthread                  \
-               $OPTS                          &&
-  invoke_installwatch                         &&
-
-  make  pkglibdir=/usr/lib                    ||
+      export CFLAGS="$CFLAGS -fPIC"
+      export CXXFLAGS="$CXXFLAGS -fPIC"
+  fi  &&
+
+  export CXX='gcc'  &&
+
+  ./configure  --prefix=/usr \
+               --disable-dependency-tracking \
+               --without-debug \
+               --without-readline \
+               --without-libedit \
+               --enable-thread-safe-client \
+               --enable-assembler \
+               --enable-local-infile \
+               --enable-largefile \
+               --localstatedir=/var/lib/mysql \
+               --infodir=/usr/share/info \
+               --mandir=/usr/share/man \
+               --with-mysqld-user="mysql" \
+               --with-unix-socket-path=/var/lib/mysql/mysql.sock \
+               --with-pthread \
+               --with-extra-charsets=all \
+               --with-embedded-server \
+               $OPTS &&
+
+  invoke_installwatch &&
+
+  make  pkglibdir=/usr/lib ||
   {
     MYSQL_EXIT=$?
     message ""
@@ -44,10 +59,10 @@
     message ""
     exit $MYSQL_EXIT;
   }
-  prepare_install                             &&
-  mkdir -p /var/lib/mysql                     &&
-  make  pkglibdir=/usr/lib  install           &&
-  rm    -rf  /usr/mysql-test                  &&
+  prepare_install                    &&
+  mkdir -p /var/lib/mysql            &&
+  make  pkglibdir=/usr/lib  install  &&
+  rm    -rf  /usr/mysql-test         &&
 
   if  [ -x /etc/init.d/mysql.server ]; then
     rm -f /etc/init.d/mysql.server
diff --git a/sql/mysql/CONFIGURE b/sql/mysql/CONFIGURE
index a96ff3f..a4f4ca3 100644
--- a/sql/mysql/CONFIGURE
+++ b/sql/mysql/CONFIGURE
@@ -1,63 +1,6 @@
-if  !  grep  -q  CONFIGURED  $MODULE_CONFIG;  then
+MYSQL_PLUGINS="heap federated partition archive blackhole"
 
- if    query  "Install client only? " n; then
-    OPTS="$OPTS --without-server"
-  else
-    if  query  "Enable InnoDB Support? Needed by KDE4/Akonadi " n; then
-      OPTS="$OPTS --with-innodb"
-    else
-      OPTS="$OPTS --without-innodb"
-    fi
-
-    if  query  "Enable BDB Support? " n; then
-      OPTS="$OPTS --with-berkeley-db"
-    else
-      OPTS="$OPTS --without-berkeley-db"
-    fi
-
-    if  query  "Enable RAID Support? " n; then
-      OPTS="$OPTS --with-raid"
-    else
-      OPTS="$OPTS --without-raid"
-    fi
-
-    if  query  "Include the Virtual IO support? " n; then
-      OPTS="$OPTS --with-vio"
-    else
-      OPTS="$OPTS --without-vio"
-    fi
-
-    if query "Include the NDB Cluster table handler? " n; then
-      OPTS="$OPTS --with-ndbcluster"
-    else
-      OPTS="$OPTS --without-ndbcluster"
-    fi
-
-    if query "Support tables with more than 4 G rows even on 32 bit platforms? " n; then
-      OPTS="$OPTS --with-big-tables"
-    else
-      OPTS="$OPTS --without-big-tables"
-    fi
-  fi
-
-  if    query  "Include the OpenSSL support? " n; then
-    OPTS="$OPTS --with-openssl"
-  fi
-
-  if    query  "Build embedded server (libmysqld), needed by KDE4 ? " n; then
-    OPTS="$OPTS --with-embedded-server"
-  else
-    OPTS="$OPTS --without-embedded-server"
-  fi
-  
-  if  query "Enable all character sets? " y; then
-    OPTS="$OPTS --with-extra-charsets=all"
-  elif query "Enable just complex character sets? " y; then
-    OPTS="$OPTS --with-extra-charsets=complex"
-  else
-    OPTS="$OPTS --disable-nls"
-  fi
-
-  echo  'CONFIGURED="y"'  >>  $MODULE_CONFIG
-  echo  'OPTS='\"$OPTS\"    >>  $MODULE_CONFIG
-fi
+for mp in $MYSQL_PLUGINS; do
+  mquery USE_$mp "Enable $mp support?" n
+done
+mquery USE_BIGTABLE "Support tables with more than 4 G rows even on 32 bit platforms?" n --with-big-tables --without-big-tables
diff --git a/sql/mysql/DEPENDS b/sql/mysql/DEPENDS
index cabe0eb..e5956ff 100644
--- a/sql/mysql/DEPENDS
+++ b/sql/mysql/DEPENDS
@@ -1,2 +1,7 @@
 depends  chkconfig
 depends  perl
+
+optional_depends  "openssl"        \
+                  "--with-ssl"     \
+                  "--without-ssl"  \
+                  "for SSL support"
diff --git a/sql/mysql/DETAILS b/sql/mysql/DETAILS
index 8547b35..ffa39a5 100644
--- a/sql/mysql/DETAILS
+++ b/sql/mysql/DETAILS
@@ -1,14 +1,14 @@
           MODULE=mysql
-         VERSION=5.0.90
+         VERSION=5.1.44
           SOURCE=$MODULE-$VERSION.tar.gz
-   SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-5.0
-   SOURCE_URL[1]=ftp://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-5.0
-   SOURCE_URL[2]=http://mysql.mirrors.pair.com/Downloads/MySQL-5.0
-   SOURCE_URL[3]=http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.0
-      SOURCE_VFY=sha1:c637d0afed52de1e3326824afa954d1ffbcc7a2f
+   SOURCE_URL[0]=ftp://mirror.mcs.anl.gov/pub/mysql/Downloads/MySQL-5.1
+   SOURCE_URL[1]=ftp://ftp.heanet.ie/mirrors/www.mysql.com/Downloads/MySQL-5.1
+   SOURCE_URL[2]=http://mysql.mirrors.pair.com/Downloads/MySQL-5.1
+   SOURCE_URL[3]=http://mirrors.sunsite.dk/mysql/Downloads/MySQL-5.1
+      SOURCE_VFY=sha1:265fbca02b2ef62926e2845d5fdf394298eb3206
         WEB_SITE=http://www.mysql.com
          ENTERED=20011114
-         UPDATED=20100130
+         UPDATED=20100225
            SHORT="A widely used and fast SQL database server"
 
 cat << EOF


More information about the Lunar-commits mailing list