From 0a3d29e18ca731cafed7155b73a92a8f2756ca27 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 28 Aug 2009 21:47:44 +0200
Subject: make allmodconfig round for lemote yeelong target

---
 package/mysql/Makefile                          |   4 +-
 package/mysql/patches/patch-configure           | 491 ++++++------------------
 package/mysql/patches/patch-include_my_global_h |   8 +-
 3 files changed, 128 insertions(+), 375 deletions(-)

(limited to 'package/mysql')

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index 5ed4e5473..7c3ffbcd2 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
-PKG_VERSION:=		5.0.83
+PKG_VERSION:=		5.0.85
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		051392064a1e32cca5c23a593908b10e
+PKG_MD5SUM:=		f672ec5154f8ea3db87fec5e0b227f4c
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libncurses zlib
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 2cde7e42c..4fe4d413c 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mysql-5.0.81.orig/configure	2009-04-16 13:56:58.000000000 +0200
-+++ mysql-5.0.81/configure	2009-05-12 10:59:57.000000000 +0200
-@@ -885,8 +885,6 @@ MYSQLD_EXTRA_LIBS
+--- mysql-5.0.85.orig/configure	2009-08-11 12:56:42.000000000 +0200
++++ mysql-5.0.85/configure	2009-08-27 22:35:38.879725240 +0200
+@@ -835,8 +835,6 @@ MYSQLD_EXTRA_LIBS
  CLIENT_EXTRA_LDFLAGS
  MYSQLD_EXTRA_LDFLAGS
  LIBDL
@@ -10,39 +9,30 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  pstack_libs
  pstack_dirs
  WRAPLIBS
-@@ -21587,165 +21585,11 @@ else
+@@ -16480,89 +16478,10 @@ else
  $as_echo "no" >&6; }
  fi
  
 -
 -
--{ $as_echo "$as_me:$LINENO: checking \"return type of sprintf\"" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"return type of sprintf\"" >&5
 -$as_echo_n "checking \"return type of sprintf\"... " >&6; }
 -
 -#check the return type of sprintf
 -case $SYSTEM_TYPE in
 -  *netware*)
--    cat >>confdefs.h <<\_ACEOF
--#define SPRINTF_RETURNS_INT 1
--_ACEOF
-- { $as_echo "$as_me:$LINENO: result: \"int\"" >&5
+-    $as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
 -$as_echo "\"int\"" >&6; }
 -    ;;
 -  *)
--if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
 -else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -  int main()
@@ -56,56 +46,20 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -     }
 -
 -_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
+-if ac_fn_c_try_run "$LINENO"; then :
 -
-+# return type of sprintf is int for Linux glibc/uClibc
- cat >>confdefs.h <<\_ACEOF
- #define SPRINTF_RETURNS_INT 1
- _ACEOF
- 
--   { $as_echo "$as_me:$LINENO: result: \"int\"" >&5
+-$as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
+-
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
 -$as_echo "\"int\"" >&6; }
 -else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-  if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
 -else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 - int main()
@@ -116,71 +70,43 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -       return 0;
 -     return -1;
 -   }
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
--cat >>confdefs.h <<\_ACEOF
--#define SPRINTF_RETURNS_PTR 1
--_ACEOF
++# return type of sprintf is int for Linux glibc/uClibc
++cat >>confdefs.h <<\_ACEOF
++#define SPRINTF_RETURNS_INT 1
+ _ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
+-$as_echo "#define SPRINTF_RETURNS_PTR 1" >>confdefs.h
 -
--                { $as_echo "$as_me:$LINENO: result: \"ptr\"" >&5
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"ptr\"" >&5
 -$as_echo "\"ptr\"" >&6; }
 -else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
 -
--( exit $ac_status )
+-$as_echo "#define SPRINTF_RETURNS_GARBAGE 1" >>confdefs.h
 -
--cat >>confdefs.h <<\_ACEOF
--#define SPRINTF_RETURNS_GARBAGE 1
--_ACEOF
--
--                { $as_echo "$as_me:$LINENO: result: \"garbage\"" >&5
+-                { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"garbage\"" >&5
 -$as_echo "\"garbage\"" >&6; }
 -fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 -fi
 -
 -
--
 -fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 -fi
 -
--
 -    ;;
 -esac
  
  # Extract the first word of "uname", so it can be a program name with args.
  set dummy uname; ac_word=$2
-@@ -22841,98 +22685,8 @@ $as_echo "no" >&6; }
+@@ -17587,97 +17506,7 @@ $as_echo "no" >&6; }
+   rm -f conftest.ic conftest.h
  fi
  
- 
+-
 -# Look for PS usage.  We use double dollar-signs in FIND_PROC because this
 -# value is written to a makefile, which interprets away one level of
 -# dollar-signs.  So, interpretation stages are  m4 and then shell in autoconf,
@@ -188,9 +114,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -# no unprotected single quotes should appear in the expression.
 -# Extract the first word of "ps", so it can be a program name with args.
 -set dummy ps; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 -$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PS+set}" = set; then
+-if test "${ac_cv_path_PS+set}" = set; then :
 -  $as_echo_n "(cached) " >&6
 -else
 -  case $PS in
@@ -203,14 +129,14 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -do
 -  IFS=$as_save_IFS
 -  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 -    ac_cv_path_PS="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
--done
+-  done
 -IFS=$as_save_IFS
 -
 -  test -z "$ac_cv_path_PS" && ac_cv_path_PS="ps"
@@ -219,18 +145,18 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -fi
 -PS=$ac_cv_path_PS
 -if test -n "$PS"; then
--  { $as_echo "$as_me:$LINENO: result: $PS" >&5
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS" >&5
 -$as_echo "$PS" >&6; }
 -else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -fi
 -
 -
--{ $as_echo "$as_me:$LINENO: checking \"how to check if pid exists\"" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"how to check if pid exists\"" >&5
 -$as_echo_n "checking \"how to check if pid exists\"... " >&6; }
 -PS=$ac_cv_path_PS
- # Linux style
+-# Linux style
 -if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
 -then
 -  FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
@@ -265,25 +191,23 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -      FIND_PROC=
 -      ;;
 -    *)
--      { { $as_echo "$as_me:$LINENO: error: Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." >&5
--$as_echo "$as_me: error: Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." >&2;}
--   { (exit 1); exit 1; }; }
+-      as_fn_error "Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual." "$LINENO" 5
 -  esac
 -fi
 -
--{ $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"$FIND_PROC\"" >&5
 -$as_echo "\"$FIND_PROC\"" >&6; }
 +FIND_PROC="/bin/ps wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
  
  # Check if a pid is valid
  # Extract the first word of "kill", so it can be a program name with args.
-@@ -26681,350 +26435,14 @@ fi
+@@ -19842,218 +19671,9 @@ fi
  fi
  
  
 -
 -if test "$TARGET_LINUX" = "true"; then
--  { $as_echo "$as_me:$LINENO: checking for atomic operations" >&5
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic operations" >&5
 -$as_echo_n "checking for atomic operations... " >&6; }
 -
 -
@@ -295,20 +219,13 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -
 -
 -  atom_ops=
--  if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-  if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
 -else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -#include <asm/atomic.h>
@@ -322,59 +239,23 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -}
 -
 -_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
- cat >>confdefs.h <<\_ACEOF
--#define HAVE_ATOMIC_ADD 1
--_ACEOF
+-if ac_fn_cxx_try_run "$LINENO"; then :
 -
--   atom_ops="${atom_ops}atomic_add "
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-$as_echo "#define HAVE_ATOMIC_ADD 1" >>confdefs.h
 -
+-   atom_ops="${atom_ops}atomic_add "
 -fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 -fi
 -
--
--  if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-  if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
 -else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -#include <asm/atomic.h>
@@ -388,48 +269,19 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -}
 -
 -_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_ATOMIC_SUB 1
--_ACEOF
+-if ac_fn_cxx_try_run "$LINENO"; then :
 -
--   atom_ops="${atom_ops}atomic_sub "
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
+-$as_echo "#define HAVE_ATOMIC_SUB 1" >>confdefs.h
 -
+-   atom_ops="${atom_ops}atomic_sub "
 -fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 -fi
 -
 -
--
 -  if test -z "$atom_ops"; then atom_ops="no"; fi
--  { $as_echo "$as_me:$LINENO: result: $atom_ops" >&5
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $atom_ops" >&5
 -$as_echo "$atom_ops" >&6; }
 -
 -  ac_ext=c
@@ -441,7 +293,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -
 -
 -# Check whether --with-pstack was given.
--if test "${with_pstack+set}" = set; then
+-if test "${with_pstack+set}" = set; then :
 -  withval=$with_pstack;  USE_PSTACK=$withval
 -else
 -   USE_PSTACK=no
@@ -453,18 +305,14 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -  then
 -    have_libiberty= have_libbfd=
 -    my_save_LIBS="$LIBS"
--    { $as_echo "$as_me:$LINENO: checking for fdmatch in -liberty" >&5
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fdmatch in -liberty" >&5
 -$as_echo_n "checking for fdmatch in -liberty... " >&6; }
--if test "${ac_cv_lib_iberty_fdmatch+set}" = set; then
+-if test "${ac_cv_lib_iberty_fdmatch+set}" = set; then :
 -  $as_echo_n "(cached) " >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-liberty  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -/* Override any GCC internal prototype to avoid an error.
@@ -482,56 +330,27 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -  return 0;
 -}
 -_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
+-if ac_fn_c_try_link "$LINENO"; then :
 -  ac_cv_lib_iberty_fdmatch=yes
 -else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_iberty_fdmatch=no
+-  ac_cv_lib_iberty_fdmatch=no
 -fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iberty_fdmatch" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iberty_fdmatch" >&5
 -$as_echo "$ac_cv_lib_iberty_fdmatch" >&6; }
--if test "x$ac_cv_lib_iberty_fdmatch" = x""yes; then
+-if test "x$ac_cv_lib_iberty_fdmatch" = x""yes; then :
 -  have_libiberty=yes
--       { $as_echo "$as_me:$LINENO: checking for bfd_openr in -lbfd" >&5
+-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bfd_openr in -lbfd" >&5
 -$as_echo_n "checking for bfd_openr in -lbfd... " >&6; }
--if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then
+-if test "${ac_cv_lib_bfd_bfd_openr+set}" = set; then :
 -  $as_echo_n "(cached) " >&6
 -else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lbfd -liberty $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -/* Override any GCC internal prototype to avoid an error.
@@ -548,45 +367,19 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -  ;
 -  return 0;
 -}
-+#define HAVE_ATOMIC_ADD 0
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && {
--	 test -z "$ac_c_werror_flag" ||
--	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
 -  ac_cv_lib_bfd_bfd_openr=yes
 -else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_bfd_bfd_openr=no
+-  ac_cv_lib_bfd_bfd_openr=no
 -fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 -fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bfd_bfd_openr" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bfd_bfd_openr" >&5
 -$as_echo "$ac_cv_lib_bfd_bfd_openr" >&6; }
--if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then
+-if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then :
 -  have_libbfd=yes
 -fi
 -
@@ -602,12 +395,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -      with_mysqld_ldflags="-all-static"
 -
 -
- 
- cat >>confdefs.h <<\_ACEOF
--#define USE_PSTACK 1
-+#define HAVE_ATOMIC_SUB 0
- _ACEOF
- 
+-
+-$as_echo "#define USE_PSTACK 1" >>confdefs.h
+-
 -    else
 -      USE_PSTACK="no"
 -    fi
@@ -623,39 +413,35 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -  COMPILE_PSTACK_FALSE=
 -fi
 -
--{ $as_echo "$as_me:$LINENO: checking if we should use pstack" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should use pstack" >&5
 -$as_echo_n "checking if we should use pstack... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $USE_PSTACK" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_PSTACK" >&5
 -$as_echo "$USE_PSTACK" >&6; }
++$as_echo "#define HAVE_ATOMIC_ADD 0" >>confdefs.h
++$as_echo "#define HAVE_ATOMIC_SUB 0" >>confdefs.h
++$as_echo "#define USE_PSTACK 0" >>confdefs.h
  
  # Check for gtty if termio.h doesn't exists
  if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
-@@ -27201,96 +26619,6 @@ fi
+@@ -20116,59 +19736,6 @@ fi
  # Later in this script LIBS will be augmented with a threads library.
  NON_THREADED_LIBS="$LIBS"
  
--{ $as_echo "$as_me:$LINENO: checking for int8" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for int8" >&5
 -$as_echo_n "checking for int8... " >&6; }
 -case $SYSTEM_TYPE in
 -  *netware)
--    { $as_echo "$as_me:$LINENO: result: no" >&5
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -    ;;
 -  *)
--if test "$cross_compiling" = yes; then
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
+-as_fn_error "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
 -else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 -/* end confdefs.h.  */
 -
 -#ifdef HAVE_STDLIB_H
@@ -677,67 +463,34 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 -}
 -
 -_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_INT_8_16_32 1
--_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
 -
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "#define HAVE_INT_8_16_32 1" >>confdefs.h
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 -$as_echo "yes" >&6; }
 -else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--{ $as_echo "$as_me:$LINENO: result: no" >&5
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 -$as_echo "no" >&6; }
 -
 -fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
 -fi
 -
--
 -    ;;
 -esac
--
+ 
  #
  # Some system specific hacks
- #
-@@ -43458,13 +42786,6 @@ $as_echo "$as_me: error: conditional \"A
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
+@@ -27705,10 +27272,6 @@ if test -z "${ASSEMBLER_TRUE}" && test -
+   as_fn_error "conditional \"ASSEMBLER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
 -if test -z "${COMPILE_PSTACK_TRUE}" && test -z "${COMPILE_PSTACK_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"COMPILE_PSTACK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"COMPILE_PSTACK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
+-  as_fn_error "conditional \"COMPILE_PSTACK\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
 -fi
  
  if test -z "${HAVE_YASSL_TRUE}" && test -z "${HAVE_YASSL_FALSE}"; then
-   { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_YASSL\" was never defined.
+   as_fn_error "conditional \"HAVE_YASSL\" was never defined.
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
index cbdc5ba6e..0513e1ca4 100644
--- a/package/mysql/patches/patch-include_my_global_h
+++ b/package/mysql/patches/patch-include_my_global_h
@@ -1,6 +1,6 @@
 $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mysql-5.0.81.orig/include/my_global.h	2009-04-16 13:48:04.000000000 +0200
-+++ mysql-5.0.81/include/my_global.h	2009-05-12 10:59:28.000000000 +0200
+--- mysql-5.0.85.orig/include/my_global.h	2009-08-11 12:50:17.000000000 +0200
++++ mysql-5.0.85/include/my_global.h	2009-08-27 22:21:39.363259500 +0200
 @@ -350,29 +350,32 @@ C_MODE_END
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
@@ -45,7 +45,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  
  /*
    A lot of our programs uses asserts, so better to always include it
-@@ -826,9 +829,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
+@@ -791,9 +794,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
  #define finite(x) (1.0 / fabs(x) > 0.0)
  #endif
  
@@ -56,4 +56,4 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 +*/
  
  #ifdef HAVE_ISINF
- /* isinf() can be used in both C and C++ code */
+ /* Check if C compiler is affected by GCC bug #39228 */
-- 
cgit v1.2.3