7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 02 Aug 2011 11:45:27 -0700
changeset 449 c9c78bf19cd7
parent 448 e07a264a6e3d
child 450 dff434c79300
7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
components/mysql-5-1/patches/configure.patch
--- a/components/mysql-5-1/patches/configure.patch	Mon Aug 01 15:44:19 2011 -0700
+++ b/components/mysql-5-1/patches/configure.patch	Tue Aug 02 11:45:27 2011 -0700
@@ -1,6 +1,16 @@
---- configure	2009-07-13 16:18:16.000000000 -0700
-+++ configure.ORG	2009-12-09 21:55:48.842728000 -0800
[email protected]@ -29786,6 +29786,8 @@
+--- configure.~2~	Tue Aug  2 10:28:18 2011
++++ configure	Tue Aug  2 10:30:32 2011
[email protected]@ -18793,7 +18793,8 @@
+ then
+   FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ # Solaris
+-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
++# added '-o comm' in case $0 is long
++elif $PS -o comm -fp $$ 2> /dev/null 1>&2
+ then
+   FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+ # BSD style
[email protected]@ -29895,6 +29896,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <stdlib.h>
@@ -9,7 +19,7 @@
   int find_stack_direction ()
   {
     static char *addr = 0;
[email protected]@ -31470,6 +31472,8 @@
[email protected]@ -31579,6 +31582,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -18,12 +28,12 @@
  int
  find_stack_direction ()
  {
[email protected]@ -47617,7 +47617,7 @@
[email protected]@ -45360,7 +45365,7 @@
      fi
  
      # if there is no readline, but we want to build with readline, we fail
 -    if test "$want_to_use_readline" = "yes" && test ! -d "./cmd-line-utils/readline"
 +    if test "$want_to_use_readline" = "yes" && test ! -d "$srcdir/cmd-line-utils/readline"
      then
- 	{ { echo "$as_me:$LINENO: error: This commercially licensed MySQL source package can't
+ 	{ { $as_echo "$as_me:$LINENO: error: This commercially licensed MySQL source package can't
  	      be built with libreadline. Please use --with-libedit to use