Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Julien ROZO (95b23adc28fd87971d3b3c4cb707b0e8cdc222a9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Julien ROZO (95b23adc28fd87971d3b3c4cb707b0e8cdc222a9)
  • Date: Fri, 30 Jan 2009 13:38:38 -0600

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

database/mysql/HISTORY | 3 +++
database/mysql/PRE_SUB_DEPENDS | 1 +
database/mysql/SUB_DEPENDS | 6 ++++++
kde4/akonadi/DEPENDS | 5 ++++-
kde4/akonadi/HISTORY | 3 +++
5 files changed, 17 insertions(+), 1 deletion(-)

New commits:
commit 95b23adc28fd87971d3b3c4cb707b0e8cdc222a9
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

mysql: fixed test in innodb case in PRE_SUB_DEPENDS

commit 2c376317124ea8e65fb525cfb84643b09ae382ed
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

akonadi: server needs InnoDB storage engine enabled in mysql

commit f7c1a668d6483ebe5e13b987bf2d60cddaec16cf
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

mysql: added forced InnoDB storage engine support in PRE_SUB_DEPENDS and
SUB_DEPENDS

diff --git a/database/mysql/HISTORY b/database/mysql/HISTORY
index 2c01d7f..dea62a1 100644
--- a/database/mysql/HISTORY
+++ b/database/mysql/HISTORY
@@ -1,3 +1,6 @@
+2009-01-30 Julien "_kaze_" ROZO <julien AT rozo.org
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: added forced InnoDB storage engine
support
+
2009-01-16 George Sherwood <gsherwood AT sourcemage.org>
* REPAIR^42a552d208cfb9e83f80714ccbcee42b^POST_REMOVE: Added
proper REPAIR file.
diff --git a/database/mysql/PRE_SUB_DEPENDS b/database/mysql/PRE_SUB_DEPENDS
index 36fa199..d989984 100755
--- a/database/mysql/PRE_SUB_DEPENDS
+++ b/database/mysql/PRE_SUB_DEPENDS
@@ -1,4 +1,5 @@
case $THIS_SUB_DEPENDS in
embedded) if [ $MSQL_EMBED == "--with-embedded-server" ]; then return 0;
fi;;
+ innodb) if [[ $MSQL_ENGINES == *InnoDB* || "$MSQL_ENGINES" == "all" ]];
then return 0; fi;;
esac
return 1
diff --git a/database/mysql/SUB_DEPENDS b/database/mysql/SUB_DEPENDS
index 69125f7..857f695 100755
--- a/database/mysql/SUB_DEPENDS
+++ b/database/mysql/SUB_DEPENDS
@@ -1,5 +1,11 @@
case $THIS_SUB_DEPENDS in
embedded) echo "Embbeded mysql requested, forcing it." &&
MSQL_EMBED="--with-embedded-server" ;;
+ innodb) echo "InnoDB storage engine support requested, forcing it." &&
+ if [ "$MSQL_ENGINES" == "none" ]; then
+ MSQL_ENGINES="InnoDB"
+ else
+ MSQL_ENGINES="$MSQL_ENGINES InnoDB"
+ fi ;;
*) echo "unknown sub-depends!"; return 1 ;;
esac
diff --git a/kde4/akonadi/DEPENDS b/kde4/akonadi/DEPENDS
index 04c78ec..728e3ec 100755
--- a/kde4/akonadi/DEPENDS
+++ b/kde4/akonadi/DEPENDS
@@ -7,4 +7,7 @@ depends automoc &&
if [[ "${AK_VER}" == "devel" ]];then
depends subversion
fi &&
-optional_depends mysql '' '' 'for akonadi server'
+optional_depends mysql '' '' 'for akonadi server' &&
+if is_depends_enabled $SPELL mysql; then
+ depends -sub innodb mysql
+fi
diff --git a/kde4/akonadi/HISTORY b/kde4/akonadi/HISTORY
index 5e7059a..34f033b 100644
--- a/kde4/akonadi/HISTORY
+++ b/kde4/akonadi/HISTORY
@@ -1,3 +1,6 @@
+2009-01-30 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DEPENDS: akonadi server needs InnoDB storage engine enabled in mysql
+
2009-01-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.1.1
* boost.diff: deleted




Archive powered by MHonArc 2.6.24.

Top of Page