components/mysql-5-1/patches/configure.patch
author Norm Jacobs <Norm.Jacobs@Oracle.COM>
Tue, 02 Aug 2011 11:45:27 -0700
changeset 449 c9c78bf19cd7
parent 444 a2a87847a213
permissions -rw-r--r--
7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
449
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     1
--- configure.~2~	Tue Aug  2 10:28:18 2011
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     2
+++ configure	Tue Aug  2 10:30:32 2011
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     3
@@ -18793,7 +18793,8 @@
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     4
 then
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     5
   FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     6
 # Solaris
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     7
-elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     8
+# added '-o comm' in case $0 is long
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
     9
+elif $PS -o comm -fp $$ 2> /dev/null 1>&2
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
    10
 then
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
    11
   FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
    12
 # BSD style
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
    13
@@ -29895,6 +29896,8 @@
444
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    14
 cat >>conftest.$ac_ext <<_ACEOF
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    15
 /* end confdefs.h.  */
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    16
 #include <stdlib.h>
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    17
+int find_stack_direction (void);
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    18
+#pragma no_inline (find_stack_direction)
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    19
  int find_stack_direction ()
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    20
  {
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    21
    static char *addr = 0;
449
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
    22
@@ -31579,6 +31582,8 @@
444
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    23
 cat >>conftest.$ac_ext <<_ACEOF
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    24
 /* end confdefs.h.  */
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    25
 $ac_includes_default
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    26
+int find_stack_direction (void);
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    27
+#pragma no_inline (find_stack_direction)
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    28
 int
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    29
 find_stack_direction ()
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    30
 {
449
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
    31
@@ -45360,7 +45365,7 @@
444
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    32
     fi
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    33
 
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    34
     # if there is no readline, but we want to build with readline, we fail
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    35
-    if test "$want_to_use_readline" = "yes" && test ! -d "./cmd-line-utils/readline"
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    36
+    if test "$want_to_use_readline" = "yes" && test ! -d "$srcdir/cmd-line-utils/readline"
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    37
     then
449
c9c78bf19cd7 7068640 Move MySQL 5.1 from SFW to Userland (fix nightly)
Norm Jacobs <Norm.Jacobs@Oracle.COM>
parents: 444
diff changeset
    38
 	{ { $as_echo "$as_me:$LINENO: error: This commercially licensed MySQL source package can't
444
a2a87847a213 7068640 Move MySQL 5.1 from SFW to Userland
Sunanda Menon <Sunanda.Menon@Sun.COM>
parents:
diff changeset
    39
 	      be built with libreadline. Please use --with-libedit to use