Skip to Content.
Sympa Menu

sm-commit - Re: [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: Ladislav Hagara <ladislav.hagara AT unob.cz>
  • To: Julien ROZO <julien AT rozo.org>
  • Cc: "sm-commit AT lists.ibiblio.org" <sm-commit AT lists.ibiblio.org>
  • Subject: Re: [SM-Commit] GIT changes to master grimoire by Julien ROZO (95b23adc28fd87971d3b3c4cb707b0e8cdc222a9)
  • Date: Sat, 31 Jan 2009 23:07:26 +0100


> 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
> +
>
> +++ 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 ;;
>
> +++ 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
>

There is a bug 14996 http://bugs.sourcemage.org/show_bug.cgi?id=14996
mentioned that SUB_DEPENDS and PRE_SUB_DEPENDS should be written in
capitals (uppercase).
It is a "Master bug: SUB_DEPENDS were agreed to be upcase". I don't know
who agreed but I like this idea. If we have really agreed we should
probably fix http://www.sourcemage.org/SUB_DEPENDS and
http://www.sourcemage.org/PRE_SUB_DEPENDS in our wiki.

And why you use $MSQL_ENGINES == *InnoDB* and not $MSQL_ENGINES == "InnoDB"?

--
Ladislav Hagara






Archive powered by MHonArc 2.6.24.

Top of Page