sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 79782 by Robin Cook for review

From: Perforce Review Daemon <p4review AT smee.org>
To: "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT sourcemage.org>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Robin Cook" <rcook AT wyrms.net>, "Seth Woolley" <seth AT swoolley.homeip.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
Subject: [SM-Commit] PERFORCE change 79782 by Robin Cook for review
Date: Thu, 25 May 2006 05:40:01 +0100 (BST)

Change 79782 by robin_cook AT CuZnDragon-pheuri.wyrms.net on 2006/05/25 05:37:45

added option to build embedded library and added subdepends on it.

Affected files ...

... //sgl/grimoires/devel/database/mysql/BUILD#6 edit
... //sgl/grimoires/devel/database/mysql/CONFIGURE#3 edit
... //sgl/grimoires/devel/database/mysql/HISTORY#31 edit
... //sgl/grimoires/devel/database/mysql/PRE_SUB_DEPENDS#1 add
... //sgl/grimoires/devel/database/mysql/SUB_DEPENDS#1 add

Differences ...

==== //sgl/grimoires/devel/database/mysql/BUILD#6 (xtext) ====

@@ -1,31 +1,31 @@
-OPTS="$MSQL_SERVER $MSQL_INNODB $OPTS" &&
+OPTS="$MSQL_SERVER $MSQL_INNODB $MSQL_EMBED $OPTS" &&

-create_account mysql &&
+create_account mysql &&

-LD_PRELOAD_OLD="$LD_PRELOAD" &&
-unset LD_PRELOAD &&
-export CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&
+LD_PRELOAD_OLD="$LD_PRELOAD" &&
+unset LD_PRELOAD &&
+export CFLAGS="$CFLAGS -DUSE_OLD_FUNCTIONS" &&

if glibc_is_nptl; then
- OPTS="$OPTS --with-named-thread-libs=-lpthread" &&
+ OPTS="$OPTS --with-named-thread-libs=-lpthread" &&
export CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
fi &&
-OPTS="$OPTS --with-mysqld-user=mysql --without-bench \
- --localstatedir=/var/lib/mysql \
- --enable-assembler --enable-thread-safe-client" &&
-default_build &&
+OPTS="$OPTS --with-mysqld-user=mysql --without-bench \
+ --localstatedir=/var/lib/mysql \
+ --enable-assembler --enable-thread-safe-client" &&
+default_build &&

-#./configure --build=$BUILD \
-# --prefix=$INSTALL_ROOT/usr \
-# --sysconfdir=$INSTALL_ROOT/etc \
-# --mandir=$INSTALL_ROOT/usr/share/man \
-# --infodir=$INSTALL_ROOT/usr/share/info \
-# --localstatedir=/var/lib/mysql \
-# --with-mysqld-user=mysql \
-# --without-bench \
-# --enable-assembler \
-# --enable-thread-safe-client \
-# $OPTS &&
+#./configure --build=$BUILD \
+# --prefix=$INSTALL_ROOT/usr \
+# --sysconfdir=$INSTALL_ROOT/etc \
+# --mandir=$INSTALL_ROOT/usr/share/man \
+# --infodir=$INSTALL_ROOT/usr/share/info \
+# --localstatedir=/var/lib/mysql \
+# --with-mysqld-user=mysql \
+# --without-bench \
+# --enable-assembler \
+# --enable-thread-safe-client \
+# $OPTS &&

-export LD_PRELOAD="$LD_PRELOAD_OLD" &&
+export LD_PRELOAD="$LD_PRELOAD_OLD" &&
make pkglibdir=/usr/lib

==== //sgl/grimoires/devel/database/mysql/CONFIGURE#3 (xtext) ====

@@ -1,2 +1,5 @@
config_query_option MSQL_SERVER "Install client only?" n
"--without-server" ""
config_query_option MSQL_INNODB "Install Innodb Support?" y
"--with-innodb" ""
+config_query_option MSQL_EMBED "Build the embedded server (libmysqld)?" n
\
+ "--with-embedded-server" ""
+

==== //sgl/grimoires/devel/database/mysql/HISTORY#31 (text) ====

@@ -1,3 +1,9 @@
+2006-05-24 Robin Cook <rcook AT wyrms.net>
+ * CONFIGURE: added embedded query
+ * BUILD: added MSQL_EMBED
+ * PRE_SUB_DEPENDS: added
+ * SUB_DEPENDS: added
+
2006-04-29 George Sherwood <george AT beernabeer.com>
* DETAILS: Updated to 5.0.21

[SM-Commit] PERFORCE change 79782 by Robin Cook for review, Perforce Review Daemon, 05/25/2006