diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 20:20:57 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-30 20:20:57 +0200 |
| commit | e2454e75ec1ee4aa50af8e96838c3feb53904d08 (patch) | |
| tree | 5a05596c49e3e1533236c478434e79660c5345b0 /package/mysql/patches | |
| parent | ee19c86dc8f3d69e9082d45d2824a18710311ecb (diff) | |
| parent | 76acdb984750a027ddc2fc899e5a15d95251bb49 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/mysql/patches')
| -rw-r--r-- | package/mysql/patches/patch-configure | 53 |
1 files changed, 50 insertions, 3 deletions
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index 1c61d1a01..aad04ff2b 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,6 +1,53 @@ --- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200 -+++ mysql-5.1.48/configure 2010-07-12 22:51:24.267118950 +0200 -@@ -48273,197 +48273,14 @@ $as_echo "$as_me: error: unknown endiann ++++ mysql-5.1.48/configure 2010-07-30 11:04:50.000000000 +0200 +@@ -19825,45 +19825,7 @@ fi + $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 ++FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null" + + { $as_echo "$as_me:$LINENO: result: \"$FIND_PROC\"" >&5 + $as_echo "\"$FIND_PROC\"" >&6; } +@@ -48273,197 +48235,14 @@ $as_echo "$as_me: error: unknown endiann esac @@ -198,7 +245,7 @@ { $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; } -@@ -48581,101 +48398,6 @@ fi +@@ -48581,101 +48360,6 @@ fi done |