diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 15:34:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-18 15:34:13 +0100 |
| commit | 902ee7e7b23751ca7a8264d36a837aa4aae12032 (patch) | |
| tree | 56c6b37cd9afd91d176cd75acb77bf32ccd20378 /package/mysql/patches/patch-configure | |
| parent | 3d45df344602687c8983f5fb609721aa8ca2469f (diff) | |
| parent | 52dbdcd1045c7a8ad96753593540719cff9f8863 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/mysql/patches/patch-configure')
| -rw-r--r-- | package/mysql/patches/patch-configure | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/package/mysql/patches/patch-configure b/package/mysql/patches/patch-configure index aad04ff2b..853c31f7f 100644 --- a/package/mysql/patches/patch-configure +++ b/package/mysql/patches/patch-configure @@ -1,6 +1,22 @@ --- mysql-5.1.48.orig/configure 2010-06-03 17:54:47.000000000 +0200 -+++ mysql-5.1.48/configure 2010-07-30 11:04:50.000000000 +0200 -@@ -19825,45 +19825,7 @@ fi ++++ mysql-5.1.48/configure 2011-01-15 12:58:47.000000000 +0100 +@@ -19764,15 +19764,6 @@ fi + + + +-# Enable the abi_check rule only if gcc is available +- +-if test "$GCC" != "yes" || expr "$CC" : ".*icc.*" +-then +- ABI_CHECK="" +-else +- ABI_CHECK="abi_check" +-fi +- + + + # Look for PS usage. We use double dollar-signs in FIND_PROC because this +@@ -19825,45 +19816,7 @@ fi $as_echo_n "checking \"how to check if pid exists\"... " >&6; } PS=$ac_cv_path_PS # Linux style @@ -47,7 +63,7 @@ { $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 +@@ -48273,197 +48226,14 @@ $as_echo "$as_me: error: unknown endiann esac @@ -245,7 +261,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 +48360,6 @@ fi +@@ -48581,101 +48351,6 @@ fi done |