fix make allmodconfig

update several packages, remove snort-wireless.

3 files changed, 241 insertions, 492 deletions

diff --git a/package/mysql/Makefile b/package/mysql/Makefile
index db20a04af..e8334bd1f 100644
--- a/package/mysql/Makefile
+++ b/package/mysql/Makefile
@@ -4,15 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mysql
-PKG_VERSION:=		5.0.85
+PKG_VERSION:=		5.1.41
 PKG_RELEASE:=		1
-PKG_BUILDDEP+=		ncurses zlib readline
-PKG_MD5SUM:=		f672ec5154f8ea3db87fec5e0b227f4c
+PKG_MD5SUM:=		b5d39e8789174753f3c782959729e68c
 PKG_DESCR:=		MySQL client library
 PKG_SECTION:=		libs
 PKG_DEPENDS:=		libncurses zlib
+PKG_BUILDDEP+=		ncurses zlib readline
 PKG_URL:=		http://www.mysql.com
-PKG_SITES=		${MASTER_SITE_MYSQL:=Downloads/MySQL-5.0/}
+PKG_SITES=		${MASTER_SITE_MYSQL:=Downloads/MySQL-5.1/}
 
 include ${TOPDIR}/mk/package.mk
 
@@ -28,10 +28,12 @@ CONFIGURE_ENV+=		OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \
 			mysql_cv_compress=yes \
 			ac_cv_sys_restartable_syscalls=no \
 			ac_cv_conv_longlong_to_float=yes \
+			mysql_cv_gcc_atomic_builtins=yes \
 			mysql_cv_gethostname_style=glibc2
 CONFIGURE_ARGS+=	--disable-assembler \
 			--with-pthread \
 			--without-raid \
+			--with-atomic-ops=rwlocks \
 			--with-unix-socket-path=/tmp/.mysql.sock \
 			--with-named-thread-libs=-lpthread \
 			--without-libwrap \
@@ -42,7 +44,7 @@ CONFIGURE_ARGS+=	--disable-assembler \
 			--without-query-cache \
 			--without-mysqlfs \
 			--without-vio \
-			--without-openssl \
+			--without-ssl \
 			--without-docs \
 			--without-bench \
 			--without-innodb \
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure
index 4fe4d413c..cf3239b22 100644
--- a/package/mysql/patches/patch-configure
+++ b/package/mysql/patches/patch-configure
@@ -1,496 +1,302 @@
---- 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
--COMPILE_PSTACK_FALSE
--COMPILE_PSTACK_TRUE
- pstack_libs
- pstack_dirs
- WRAPLIBS
-@@ -16480,89 +16478,10 @@ else
- $as_echo "no" >&6; }
- fi
+--- mysql-5.1.41.orig/configure	2009-11-04 19:37:28.000000000 +0100
++++ mysql-5.1.41/configure	2009-12-25 12:18:01.000000000 +0100
+@@ -46976,197 +46976,14 @@ $as_echo "$as_me: error: unknown endiann
+   esac
  
--
--
--{ $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*)
--    $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:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether GCC atomic builtins are available" >&5
+-$as_echo_n "checking whether GCC atomic builtins are available... " >&6; }
+-  # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not
+-  if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
+-{ { $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; }; }; }
 -else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--  int main()
--    {
--      char* s = "hello";
--      char buf[6];
--      if((int)sprintf(buf, s) == strlen(s))
--	return 0;
--
--      return -1;
--     }
+-      int main()
+-      {
+-	long	x;
+-	long	y;
+-	long	res;
+-	char	c;
+-
+-	x = 10;
+-	y = 123;
+-	res = __sync_bool_compare_and_swap(&x, x, y);
+-	if (!res || x != y) {
+-          return(1);
+-        }
+-
+-	x = 10;
+-	y = 123;
+-	res = __sync_bool_compare_and_swap(&x, x + 1, y);
+-	if (res || x != 10) {
+-          return(1);
+-        }
+-
+-	x = 10;
+-	y = 123;
+-	res = __sync_add_and_fetch(&x, y);
+-	if (res != 123 + 10 || x != 123 + 10) {
+-	  return(1);
+-	}
+-
+-	c = 10;
+-	res = __sync_lock_test_and_set(&c, 123);
+-	if (res != 10 || c != 123) {
+-	  return(1);
+-	}
+-
+-	return(0);
+-      }
 -
 -_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--$as_echo "#define SPRINTF_RETURNS_INT 1" >>confdefs.h
+-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
 -
--   { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"int\"" >&5
--$as_echo "\"int\"" >&6; }
--else
--  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_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
 -
-- int main()
--   {
--     char* s = "hello";
--     char buf[6];
--     if((char*)sprintf(buf,s) == buf + strlen(s))
--       return 0;
--     return -1;
--   }
-+# return type of sprintf is int for Linux glibc/uClibc
-+cat >>confdefs.h <<\_ACEOF
-+#define SPRINTF_RETURNS_INT 1
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IB_GCC_ATOMIC_BUILTINS 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: yes" >&5
+-$as_echo "yes" >&6; }
 -
--                { $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
 -
--$as_echo "#define SPRINTF_RETURNS_GARBAGE 1" >>confdefs.h
+-( exit $ac_status )
 -
--                { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"garbage\"" >&5
--$as_echo "\"garbage\"" >&6; }
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -
 -
 -fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext 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
-@@ -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,
--# then Make, then shell.  The autoconf substitution uses single quotes, so
--# 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:${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 :
--  $as_echo_n "(cached) " >&6
--else
--  case $PS in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_PS="$PS" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--    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:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--  done
--IFS=$as_save_IFS
--
--  test -z "$ac_cv_path_PS" && ac_cv_path_PS="ps"
--  ;;
--esac
--fi
--PS=$ac_cv_path_PS
--if test -n "$PS"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PS" >&5
--$as_echo "$PS" >&6; }
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
 -
--
--{ $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
--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"
--# Solaris
--elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
--then
--  FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
--# BSD style
--elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
--then
--  FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--# SysV style
--elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
--then
--  FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--# Do anybody use this?
--elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
--then
--  FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+-  { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by GCC atomic builtins" >&5
+-$as_echo_n "checking whether pthread_t can be used by GCC atomic builtins... " >&6; }
+-  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
+-  if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$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; }; }; }
 -else
--  case $SYSTEM_TYPE in
--    *freebsd*|*dragonfly*)
--      FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
--      ;;
--    *darwin*)
--      FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--      ;;
--    *cygwin*)
--      FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
--      ;;
--    *netware*)
--      FIND_PROC=
--      ;;
--    *)
--      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:${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.
-@@ -19842,218 +19671,9 @@ fi
- fi
- 
- 
--
--if test "$TARGET_LINUX" = "true"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for atomic operations" >&5
--$as_echo_n "checking for atomic operations... " >&6; }
--
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -
--  ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-      #include <pthread.h>
+-      #include <string.h>
 -
+-      int main(int argc, char** argv) {
+-        pthread_t       x1;
+-        pthread_t       x2;
+-        pthread_t       x3;
 -
--  atom_ops=
--  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_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
+-	memset(&x1, 0x0, sizeof(x1));
+-	memset(&x2, 0x0, sizeof(x2));
+-	memset(&x3, 0x0, sizeof(x3));
 -
--#include <asm/atomic.h>
--int main()
--{
--  atomic_t v;
+-        __sync_bool_compare_and_swap(&x1, x2, x3);
 -
--  atomic_set(&v, 23);
--  atomic_add(5, &v);
--  return atomic_read(&v) == 28 ? 0 : -1;
--}
+-        return(0);
+-      }
 -
 -_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
+-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
 -
--$as_echo "#define HAVE_ATOMIC_ADD 1" >>confdefs.h
 -
--   atom_ops="${atom_ops}atomic_add "
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
--fi
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_IB_ATOMIC_PTHREAD_T_GCC 1
+ _ACEOF
+ 
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
 -
--  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_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
 -else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--#include <asm/atomic.h>
--int main()
--{
--  atomic_t v;
+-  $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
 -
--  atomic_set(&v, 23);
--  atomic_sub(5, &v);
--  return atomic_read(&v) == 18 ? 0 : -1;
--}
+-( exit $ac_status )
 -
--_ACEOF
--if ac_fn_cxx_try_run "$LINENO"; then :
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
 -
--$as_echo "#define HAVE_ATOMIC_SUB 1" >>confdefs.h
 -
--   atom_ops="${atom_ops}atomic_sub "
 -fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -
 -
--  if test -z "$atom_ops"; then atom_ops="no"; fi
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $atom_ops" >&5
--$as_echo "$atom_ops" >&6; }
--
--  ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
--
--# Check whether --with-pstack was given.
--if test "${with_pstack+set}" = set; then :
--  withval=$with_pstack;  USE_PSTACK=$withval
--else
--   USE_PSTACK=no
--fi
--
--  pstack_libs=
--  pstack_dirs=
--  if test "$USE_PSTACK" = yes -a "$TARGET_LINUX" = "true" -a "$BASE_MACHINE_TYPE" = "i386"
--  then
--    have_libiberty= have_libbfd=
--    my_save_LIBS="$LIBS"
--    { $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 :
--  $as_echo_n "(cached) " >&6
+ 
+   { $as_echo "$as_me:$LINENO: checking whether Solaris libc atomic functions are available" >&5
+ $as_echo_n "checking whether Solaris libc atomic functions are available... " >&6; }
+@@ -47284,101 +47101,6 @@ fi
+ done
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether pthread_t can be used by Solaris libc atomic functions" >&5
+-$as_echo_n "checking whether pthread_t can be used by Solaris libc atomic functions... " >&6; }
+-  # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not
+-  if test "$cross_compiling" = yes; then
+-  { { $as_echo "$as_me:$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; }; }; }
 -else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-liberty  $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
--
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char fdmatch ();
--int
--main ()
--{
--return fdmatch ();
--  ;
--  return 0;
--}
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
 -_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_iberty_fdmatch=yes
--else
--  ac_cv_lib_iberty_fdmatch=no
--fi
--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:${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 :
--  have_libiberty=yes
--       { $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 :
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-lbfd -liberty $LIBS"
--cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -
--/* Override any GCC internal prototype to avoid an error.
--   Use char because int might match the return type of a GCC
--   builtin and then its argument prototype would still apply.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bfd_openr ();
--int
--main ()
--{
--return bfd_openr ();
--  ;
--  return 0;
--}
--_ACEOF
--if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_bfd_bfd_openr=yes
--else
--  ac_cv_lib_bfd_bfd_openr=no
--fi
--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:${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 :
--  have_libbfd=yes
--fi
--
--fi
+-      #include <pthread.h>
+-      #include <string.h>
 -
--    LIBS="$my_save_LIBS"
+-      int main(int argc, char** argv) {
+-        pthread_t       x1;
+-        pthread_t       x2;
+-        pthread_t       x3;
 -
--    if test x"$have_libiberty" = xyes -a x"$have_libbfd" = xyes
--    then
--      pstack_dirs='$(top_srcdir)'/pstack
--      pstack_libs="../pstack/libpstack.a -lbfd -liberty"
--      # We must link staticly when using pstack
--      with_mysqld_ldflags="-all-static"
+-        memset(&x1, 0x0, sizeof(x1));
+-        memset(&x2, 0x0, sizeof(x2));
+-        memset(&x3, 0x0, sizeof(x3));
 -
+-        if (sizeof(pthread_t) == 4) {
 -
+-          atomic_cas_32(&x1, x2, x3);
 -
--$as_echo "#define USE_PSTACK 1" >>confdefs.h
+-        } else if (sizeof(pthread_t) == 8) {
 -
--    else
--      USE_PSTACK="no"
--    fi
--  else
--    USE_PSTACK="no"
--  fi
--fi
-- if test "$USE_PSTACK" = "yes"; then
--  COMPILE_PSTACK_TRUE=
--  COMPILE_PSTACK_FALSE='#'
--else
--  COMPILE_PSTACK_TRUE='#'
--  COMPILE_PSTACK_FALSE=
--fi
+-          atomic_cas_64(&x1, x2, x3);
 -
--{ $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:${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"
-@@ -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:${as_lineno-$LINENO}: checking for int8" >&5
--$as_echo_n "checking for int8... " >&6; }
--case $SYSTEM_TYPE in
--  *netware)
--    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--    ;;
--  *)
--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_fn_error "cannot run test program while cross compiling
--See \`config.log' for more details." "$LINENO" 5; }
--else
--  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h.  */
+-        } else {
 -
--#ifdef HAVE_STDLIB_H
--#include <stdlib.h>
--#endif
+-          return(1);
+-        }
 -
--#ifdef HAVE_STDDEF_H
--#include <stddef.h>
--#endif
+-	return(0);
+-      }
 -
--#ifdef HAVE_SYS_TYPES_H
--#include <sys/types.h>
--#endif
+-_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
 -
--int main()
--{
--  int8 i;
--  return 0;
--}
 -
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS 1
 -_ACEOF
--if ac_fn_c_try_run "$LINENO"; then :
--
--$as_echo "#define HAVE_INT_8_16_32 1" >>confdefs.h
 -
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
 -$as_echo "yes" >&6; }
+-
 -else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-  $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 "no" >&6; }
 -
+-
 -fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
--  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -
--    ;;
--esac
  
- #
- # Some system specific hacks
-@@ -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_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_fn_error "conditional \"HAVE_YASSL\" was never defined.
+   # this is needed to know which one of atomic_cas_32() or atomic_cas_64()
diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h
deleted file mode 100644
index 0513e1ca4..000000000
--- a/package/mysql/patches/patch-include_my_global_h
+++ /dev/null
@@ -1,59 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- 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>
- #endif
-+
- #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA)
- #undef HAVE_ALLOCA
- #undef HAVE_ALLOCA_H
- #endif
--#ifdef HAVE_ALLOCA_H
--#include <alloca.h>
-+
-+#if defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__)
-+#ifndef BSD
-+#define BSD
- #endif
--#ifdef HAVE_ATOMIC_ADD
--#define new my_arg_new
--#define need_to_restore_new 1
--C_MODE_START
--#include <asm/atomic.h>
--C_MODE_END
--#ifdef need_to_restore_new /* probably safer than #ifdef new */
--#undef new
--#undef need_to_restore_new
- #endif
-+
-+#if defined(HAVE_ALLOCA_H) && !defined(BSD)
-+#include <alloca.h>
- #endif
-+
- #include <errno.h>				/* Recommended by debian */
- /* We need the following to go around a problem with openssl on solaris */
-+#ifdef BSD
-+#include <pwd.h>
-+#include <unistd.h>
-+#else
- #if defined(HAVE_CRYPT_H)
- #include <crypt.h>
- #endif
-+#endif
- 
- /*
-   A lot of our programs uses asserts, so better to always include it
-@@ -791,9 +794,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
- #define finite(x) (1.0 / fabs(x) > 0.0)
- #endif
- 
-+/*
- #ifndef HAVE_ISNAN
- #define isnan(x) ((x) != (x))
- #endif
-+*/
- 
- #ifdef HAVE_ISINF
- /* Check if C compiler is affected by GCC bug #39228 */