From 219a6dab8995aad9ac4860cc1a84d6f3509a03a4 Mon Sep 17 00:00:00 2001 From: wbx Date: Sun, 17 May 2009 14:41:34 +0200 Subject: Initial import --- package/mysql/Config.in | 19 + package/mysql/Makefile | 84 +++ package/mysql/ipkg/libmysqlclient.control | 5 + package/mysql/patches/patch-configure | 743 ++++++++++++++++++++++++ package/mysql/patches/patch-include_my_global_h | 59 ++ 5 files changed, 910 insertions(+) create mode 100644 package/mysql/Config.in create mode 100644 package/mysql/Makefile create mode 100644 package/mysql/ipkg/libmysqlclient.control create mode 100644 package/mysql/patches/patch-configure create mode 100644 package/mysql/patches/patch-include_my_global_h (limited to 'package/mysql') diff --git a/package/mysql/Config.in b/package/mysql/Config.in new file mode 100644 index 000000000..29a3f1c82 --- /dev/null +++ b/package/mysql/Config.in @@ -0,0 +1,19 @@ +config ADK_COMPILE_MYSQL + tristate + default n + depends ADK_PACKAGE_LIBMYSQLCLIENT + depends ADK_CXX + select ADK_PACKAGE_LIBNCURSES + select ADK_PACKAGE_ZLIB + +config ADK_PACKAGE_LIBMYSQLCLIENT + prompt "libmysqlclient.................... MySQL client library" + tristate + default n + depends ADK_CXX + select ADK_COMPILE_MYSQL + help + MySQL client library. + + http://dev.mysql.com/ + diff --git a/package/mysql/Makefile b/package/mysql/Makefile new file mode 100644 index 000000000..0f80c9e02 --- /dev/null +++ b/package/mysql/Makefile @@ -0,0 +1,84 @@ +# $Id$ +#- +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include ${TOPDIR}/rules.mk + +PKG_NAME:= mysql +PKG_VERSION:= 5.0.81 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 2d35e4980f279c839172a6efdb0f0b15 +MASTER_SITES= ${MASTER_SITE_MYSQL:=Downloads/MySQL-5.0/} + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,LIBMYSQLCLIENT,libmysqlclient,${PKG_VERSION}-${PKG_RELEASE},${ARCH})) + +CONFIGURE_STYLE:= gnu +CONFIGURE_ENV+= OPTIMIZE_CFLAGS="${TARGET_CFLAGS}" \ + OPTIMIZE_CXXFLAGS="${TARGET_CFLAGS}" \ + ac_cv_sys_restartable_syscalls=yes \ + mysql_cv_sys_os=Linux \ + mysql_cv_compress=yes \ + ac_cv_sys_restartable_syscalls=no \ + ac_cv_conv_longlong_to_float=yes \ + mysql_cv_gethostname_style=glibc2 +CONFIGURE_ARGS+= --disable-assembler \ + --with-pthread \ + --without-raid \ + --with-unix-socket-path=/tmp/.mysql.sock \ + --with-named-thread-libs=-lpthread \ + --without-libwrap \ + --without-pstack \ + --with-low-memory \ + --without-server \ + --without-embedded-server \ + --without-query-cache \ + --without-mysqlfs \ + --without-vio \ + --without-openssl \ + --without-docs \ + --without-bench \ + --without-innodb \ + --without-readline \ + --with-machine-type=${CPU_ARCH} +HOSTTOOLFLAGS= CC="${HOSTCC}" \ + CXX='c++' \ + CFLAGS='${HOSTCFLAGS} -DHOSTCOMPILE=1' \ + CXXFLAGS='${HOSTCFLAGS}' \ + LDFLAGS='${HOSTLDFLAGS}' \ + CPPFLAGS='${HOSTCPPFLAGS}' \ + CXXLINK='c++ ${HOSTCFLAGS} ${HOSTLDFLAGS} -o $$@' \ + LINK='${HOSTCC} ${HOSTCFLAGS} ${HOSTLDFLAGS} -o $$@' +ifneq (${OStype},Linux) +HOSTTOOLFLAGS+= LIBS='-lm -lz' +endif + +do-build: + ${MAKE} -C "${WRKBUILD}" \ + SUBDIRS="include" \ + DESTDIR="${WRKINST}" \ + all install + ${MAKE} -C "${WRKBUILD}/libmysql" \ + LINK="${HOSTCC} -o conf_to_src -lc" \ + ${HOSTTOOLFLAGS} \ + conf_to_src + ${MAKE} -C "${WRKBUILD}" \ + CFLAGS="${TARGET_CFLAGS}" \ + SUBDIRS="libmysql" \ + DESTDIR="${WRKINST}" \ + all install + ${MAKE} -C "${WRKBUILD}" \ + CFLAGS="${TARGET_CFLAGS}" \ + SUBDIRS="scripts" \ + DESTDIR="${WRKINST}" \ + bin_SCRIPTS="mysql_config" \ + all install + +do-install: + ${INSTALL_DIR} ${IDIR_LIBMYSQLCLIENT}/usr/lib/mysql + ${CP} ${WRKINST}/usr/lib/mysql/libmysqlclient.so* \ + ${IDIR_LIBMYSQLCLIENT}/usr/lib/mysql + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/mysql/ipkg/libmysqlclient.control b/package/mysql/ipkg/libmysqlclient.control new file mode 100644 index 000000000..84055412b --- /dev/null +++ b/package/mysql/ipkg/libmysqlclient.control @@ -0,0 +1,5 @@ +Package: libmysqlclient +Priority: optional +Section: libs +Depends: libncurses, zlib +Description: MySQL client library diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure new file mode 100644 index 000000000..2cde7e42c --- /dev/null +++ b/package/mysql/patches/patch-configure @@ -0,0 +1,743 @@ +$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 + CLIENT_EXTRA_LDFLAGS + MYSQLD_EXTRA_LDFLAGS + LIBDL +-COMPILE_PSTACK_FALSE +-COMPILE_PSTACK_TRUE + pstack_libs + pstack_dirs + WRAPLIBS +@@ -21587,165 +21585,11 @@ else + $as_echo "no" >&6; } + fi + +- +- +-{ $as_echo "$as_me:$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 "\"int\"" >&6; } +- ;; +- *) +-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 +- 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; +- } +- +-_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 +- ++# 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 "\"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 +-$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 +- 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((char*)sprintf(buf,s) == buf + strlen(s)) +- 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 +- +- { $as_echo "$as_me:$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 ) +- +-cat >>confdefs.h <<\_ACEOF +-#define SPRINTF_RETURNS_GARBAGE 1 +-_ACEOF +- +- { $as_echo "$as_me:$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 +-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 +-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; } + 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:$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:$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:$LINENO: result: $PS" >&5 +-$as_echo "$PS" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-{ $as_echo "$as_me:$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" +-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_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; }; } +- esac +-fi +- +-{ $as_echo "$as_me:$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 + fi + + +- +-if test "$TARGET_LINUX" = "true"; then +- { $as_echo "$as_me:$LINENO: checking for atomic operations" >&5 +-$as_echo_n "checking for atomic operations... " >&6; } +- +- +- 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 +- +- +- atom_ops= +- 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 +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-int main() +-{ +- atomic_t v; +- +- atomic_set(&v, 23); +- atomic_add(5, &v); +- return atomic_read(&v) == 28 ? 0 : -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 HAVE_ATOMIC_ADD 1 +-_ACEOF +- +- 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 +- +-fi +-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 "$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 +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-int main() +-{ +- atomic_t v; +- +- atomic_set(&v, 23); +- atomic_sub(5, &v); +- return atomic_read(&v) == 18 ? 0 : -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 HAVE_ATOMIC_SUB 1 +-_ACEOF +- +- 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 +- +-fi +-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:$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:$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 +-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 +-/* 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; +-} +-_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 +- 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 +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- 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 "$ac_cv_lib_iberty_fdmatch" >&6; } +-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_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 >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-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; +-} ++#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 +- 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 +-fi +- +-rm -rf conftest.dSYM +-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ +- 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 "$ac_cv_lib_bfd_bfd_openr" >&6; } +-if test "x$ac_cv_lib_bfd_bfd_openr" = x""yes; then +- have_libbfd=yes +-fi +- +-fi +- +- LIBS="$my_save_LIBS" +- +- 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" +- +- + + cat >>confdefs.h <<\_ACEOF +-#define USE_PSTACK 1 ++#define HAVE_ATOMIC_SUB 0 + _ACEOF + +- 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 +- +-{ $as_echo "$as_me:$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 "$USE_PSTACK" >&6; } + + # 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 + # 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_n "checking for int8... " >&6; } +-case $SYSTEM_TYPE in +- *netware) +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- ;; +- *) +-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 +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#ifdef HAVE_STDLIB_H +-#include +-#endif +- +-#ifdef HAVE_STDDEF_H +-#include +-#endif +- +-#ifdef HAVE_SYS_TYPES_H +-#include +-#endif +- +-int main() +-{ +- int8 i; +- return 0; +-} +- +-_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 +- +-{ $as_echo "$as_me:$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 "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 +-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; }; } + 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; }; } +-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. diff --git a/package/mysql/patches/patch-include_my_global_h b/package/mysql/patches/patch-include_my_global_h new file mode 100644 index 000000000..cbdc5ba6e --- /dev/null +++ b/package/mysql/patches/patch-include_my_global_h @@ -0,0 +1,59 @@ +$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 +@@ -350,29 +350,32 @@ C_MODE_END + #ifdef HAVE_UNISTD_H + #include + #endif ++ + #if defined(__cplusplus) && defined(NO_CPLUSPLUS_ALLOCA) + #undef HAVE_ALLOCA + #undef HAVE_ALLOCA_H + #endif +-#ifdef HAVE_ALLOCA_H +-#include ++ ++#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 +-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 + #endif ++ + #include /* Recommended by debian */ + /* We need the following to go around a problem with openssl on solaris */ ++#ifdef BSD ++#include ++#include ++#else + #if defined(HAVE_CRYPT_H) + #include + #endif ++#endif + + /* + A lot of our programs uses asserts, so better to always include it +@@ -826,9 +829,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 + /* isinf() can be used in both C and C++ code */ -- cgit v1.2.3