Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (44236132f080cfebb90aac20e777c9625296e0ad)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (44236132f080cfebb90aac20e777c9625296e0ad)
  • Date: Tue, 16 Nov 2010 07:59:32 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

database/mariadb/BUILD | 2 +-
database/mariadb/CONFIGURE | 28 +++++++++++++++-------------
database/mariadb/DEPENDS | 26 +++++++++++++++++++++++---
database/mariadb/FINAL | 2 ++
database/mariadb/HISTORY | 10 ++++++++++
database/mariadb/PRE_BUILD | 7 ++++++-
database/mariadb/PRE_SUB_DEPENDS | 2 +-
database/mariadb/SUB_DEPENDS | 2 +-
database/mariadb/zlib-conf.patch | 13 +++++++++++++
9 files changed, 72 insertions(+), 20 deletions(-)

New commits:
commit 44236132f080cfebb90aac20e777c9625296e0ad
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

mariadb: a bit more refactoring & fixes

diff --git a/database/mariadb/BUILD b/database/mariadb/BUILD
index 4bc45d2..072a7d9 100755
--- a/database/mariadb/BUILD
+++ b/database/mariadb/BUILD
@@ -1,6 +1,6 @@
create_account mariadb &&

-OPTS="$MADB_SERVER $MADB_EMBED $OPTS" &&
+OPTS="$MADB_OPTS $OPTS" &&
CFLAGS="${CFLAGS//-ffast-math}" &&

local LD_PRELOAD_OLD="$LD_PRELOAD" &&
diff --git a/database/mariadb/CONFIGURE b/database/mariadb/CONFIGURE
index cab8651..496c711 100755
--- a/database/mariadb/CONFIGURE
+++ b/database/mariadb/CONFIGURE
@@ -1,10 +1,18 @@
-source $GRIMOIRE/config_query_multi.function &&
+source $GRIMOIRE/config_query_multi.function &&

-config_query_option MADB_SERVER \
- "Install client only?" \
- n \
- "--without-server" \
- "--with-server" &&
+config_query_option MADB_OPTS "Install client only?" n \
+ "--without-server" \
+ "--with-server" &&
+
+config_query_option MADB_OPTS "Build the embedded server (libmysqld)?" n \
+ "--with-embedded-server" \
+ "--without-embedded-server" &&
+
+if list_find "$MADB_OPTS" "--with-server"; then
+ config_query_option MADB_OPTS "Use libevent and have connection pooling?"
n \
+ "--with-libevent=yes" \
+ "--with-libevent=no"
+fi &&

config_query_list MADB_CHARSET "Select default character set" \
latin1 \
@@ -74,10 +82,4 @@ if list_find "$MADB_ENGINES" "all"; then
MADB_ENGINES="all"
elif list_find "$MADB_ENGINES" "none"; then
MADB_ENGINES="none"
-fi &&
-
-config_query_option MADB_EMBED \
- "Build the embedded server (libmysqld)?" \
- n \
- "--with-embedded-server" \
- "--without-embedded-server"
+fi
diff --git a/database/mariadb/DEPENDS b/database/mariadb/DEPENDS
index d4819eb..c55b14d 100755
--- a/database/mariadb/DEPENDS
+++ b/database/mariadb/DEPENDS
@@ -1,13 +1,33 @@
-depends zlib &&
depends perl &&
depends procps &&
depends g++ &&

+optional_depends zlib \
+ "--with-zlib-dir=$INSTALL_ROOT/" \
+ "--with-zlib-dir=bundled" \
+ "to use system zlib instead of bundled" &&
+
+optional_depends readline \
+ "--without-readline" "" \
+ "to use system readline instead of bundled" &&
+
+optional_depends libedit \
+ "--without-libedit" "" \
+ "to use system libedit instead of bundled" &&
+
optional_depends openssl \
"--with-ssl" \
"--without-ssl" \
"for OpenSSL support" &&

-if list_find "$MADB_ENGINES" "all" || list_find "$MADB_ENGINES" "sphinx";
then
- depends sphinx "--with-plugin-sphinx"
+optional_depends valgrind \
+ "--with-valgrind" \
+ "--without-valgrind" \
+ "for Valgrind instrumentation" &&
+
+if list_find "$MADB_OPTS" "--with-libevent=yes"; then
+ optional_depends libevent \
+ "--with-libevent=$INSTALL_ROOT/usr" \
+ "--with-libevent=bundled" \
+ "to use system libevent instead of bundled"
fi
diff --git a/database/mariadb/FINAL b/database/mariadb/FINAL
index 9e21478..daee887 100755
--- a/database/mariadb/FINAL
+++ b/database/mariadb/FINAL
@@ -1,4 +1,6 @@
+if list_find "$MADB_OPTS" "--with-server" ]]; then
message "${MESSAGE_COLOR}After initial install of MariaDB run"
message "\"mysql_install_db --user=mariadb\" to create directory"
message "structure and initial tables. See MariaDB documentation"
message "for more information${DEFAULT_COLOR}"
+fi
diff --git a/database/mariadb/HISTORY b/database/mariadb/HISTORY
index 25edfb5..7a90887 100644
--- a/database/mariadb/HISTORY
+++ b/database/mariadb/HISTORY
@@ -1,3 +1,13 @@
+2010-11-16 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: sphinx headers are not required; added libevent, readline,
+ libedit dependencies
+ * CONFIGURE: added libevent query; unified to use MADB_OPTS
+ * FINAL: needed only if the server part had been compiled-in
+ * BUILD: use MADB_OPTS
+ * {PRE_}SUB_DEPENDS: unified to use MADB_OPTS
+ * PRE_BUILD: apply the patch
+ * zlib-conf.patch: added, to fix configuration with our system zlib
+
2010-11-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 5.2.3 (latest stable); removed useless
SOURCE2_IGNORE; set correct mirrors; fixed ENTERED, descriptions
diff --git a/database/mariadb/PRE_BUILD b/database/mariadb/PRE_BUILD
index db6414a..68b9b02 100755
--- a/database/mariadb/PRE_BUILD
+++ b/database/mariadb/PRE_BUILD
@@ -1,4 +1,9 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql/Makefile.in &&
-sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in
+sedit 's:$(libdir)/@PACKAGE@:$(libdir):' libmysql_r/Makefile.in &&
+
+# our zlib location isn't default
+if is_depends_enabled $SPELL zlib; then
+ patch -p0 < "$SPELL_DIRECTORY/zlib-conf.patch"
+fi
diff --git a/database/mariadb/PRE_SUB_DEPENDS
b/database/mariadb/PRE_SUB_DEPENDS
index 414ee98..cc7ba91 100755
--- a/database/mariadb/PRE_SUB_DEPENDS
+++ b/database/mariadb/PRE_SUB_DEPENDS
@@ -1,5 +1,5 @@
case $THIS_SUB_DEPENDS in
- embedded|EMBEDDED) if [ $MADB_EMBED == "--with-embedded-server" ]; then
return 0; fi;;
+ embedded|EMBEDDED) if list_find "$MADB_OPTS" "--with-embedded-server";
then return 0; fi;;
innodb|INNODB) if [[ $MADB_ENGINES == *innodb_plugin* || "$MADB_ENGINES"
== "all" ]]; then return 0; fi;;
esac
return 1
diff --git a/database/mariadb/SUB_DEPENDS b/database/mariadb/SUB_DEPENDS
index b6b3018..df9d64b 100755
--- a/database/mariadb/SUB_DEPENDS
+++ b/database/mariadb/SUB_DEPENDS
@@ -1,6 +1,6 @@
case $THIS_SUB_DEPENDS in
embedded|EMBEDDED) echo "Embbeded mysql requested, forcing it." &&
- MADB_EMBED="--with-embedded-server" ;;
+ MADB_OPTS="--with-embedded-server $MADB_OPTS"
;;
innodb|INNODB) echo "InnoDB storage engine support requested, forcing
it." &&
if [ "$MADB_ENGINES" == "none" ]; then
MADB_ENGINES="innodb_plugin"
diff --git a/database/mariadb/zlib-conf.patch
b/database/mariadb/zlib-conf.patch
new file mode 100644
index 0000000..794b33d
--- /dev/null
+++ b/database/mariadb/zlib-conf.patch
@@ -0,0 +1,13 @@
+--- configure.orig 2010-11-16 15:22:06.000000000 +0300
++++ configure 2010-11-16 15:22:21.694157446 +0300
+@@ -22845,8 +22845,8 @@
+ -f "$mysql_zlib_dir/lib/libz.so" -o \
+ -f "$mysql_zlib_dir/lib/libz.sl" -o \
+ -f "$mysql_zlib_dir/lib/libz.dylib" \) \
+- -a -f "$mysql_zlib_dir/include/zlib.h"; then
+- ZLIB_INCLUDES="-I$mysql_zlib_dir/include"
++ -a -f "$mysql_zlib_dir/usr/include/zlib.h"; then
++ ZLIB_INCLUDES="-I$mysql_zlib_dir/usr/include"
+ ZLIB_LIBS="-L$mysql_zlib_dir/lib -lz"
+
+ save_CPPFLAGS="$CPPFLAGS"



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (44236132f080cfebb90aac20e777c9625296e0ad), Vlad Glagolev, 11/16/2010

Archive powered by MHonArc 2.6.24.

Top of Page