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

Perforce Review Daemon p4review at smee.org
Thu May 25 00:40:01 EDT 2006


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
 



More information about the SM-Commit mailing list